infopark_fiona7 0.71.0.6 → 0.71.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c14523518e257dd8aac6700eee128ff69aaa9741
-  data.tar.gz: 693b82cb59011cac2c96c6b1c83a72d1967b761d
+  metadata.gz: 07728fd57fdb01877b58ba69bde489bc1e5e2508
+  data.tar.gz: bb716b43bd3cf4f5a2939f794386126315e488cc
 SHA512:
-  metadata.gz: 311e175c753051f99eccf5bdb03d8abec2e0e6065b8a1111cad6d7fcb5c04747f231796b5e590f7a55e13f562b1e54bf3f585d5c3dad13e3af08b23dad8bdbd7
-  data.tar.gz: 2a55154cf81b325cfd6e8395b411d4cd9674c971bce3e99fe6335bf92ada195ea2f1f639555bc7ce6f0a09448622a97578467709d7219650d0230c6fd7e21414
+  metadata.gz: eb53ab8dd8c92567f7939801f61cc715fe299273346294d801a81dabdf54d5387ab4899fb3978fabec66f0d4b9c266163d1d04c2742d69fa7d7511c187348125
+  data.tar.gz: 328d9ac70b382b59fdb1632859ae0a4f00f338f7aa25d33d5c0ace84346c5828298c20841cd8eaa57e6b34becc454a00f9a5b2ed94595ffbc10ae70c7f17e8f9

data/app/controllers/fiona7/blobs_controller.rb

@@ -1,6 +1,9 @@
+require 'fiona7/controller_helper'
+
 module Fiona7
   class BlobsController < ActionController::Base
     include Fiona7::BinaryHandling::DeliveryMixin
+    include Fiona7::ControllerHelper
     include RailsConnector::CmsAccessible
 
     before_filter :load_obj

data/app/helpers/fiona7_override_helper.rb

@@ -45,7 +45,7 @@ module Fiona7OverrideHelper
       fiona_child = children_map[scrivito_child.id]
 
       next if fiona_child.suppressed? # suppress_export
-      next if !scrivito_in_editable_view? && !fiona_child.active? # valid_from & valid_until
+      next if !Fiona7::EditingEnvCheck.new(request.env).rtc_selected? && !fiona_child.active? # valid_from & valid_until
 
       block.call(list, fiona_child)
     end

data/lib/fiona7/access_permission_check.rb

@@ -10,7 +10,7 @@ module Fiona7
     end
 
     def read_permitted?
-      if editing?
+      if edited_contents_visible?
         read_permission_check
       else
         live_permission_check 
@@ -20,8 +20,8 @@ module Fiona7
     protected
     attr_accessor :obj, :env, :rc_user, :reactor_user
     
-    def editing?
-      Fiona7::EditingEnvCheck.new(self.env).check?
+    def edited_contents_visible?
+      Fiona7::EditingEnvCheck.new(self.env).rtc_selected?
     end
 
     # this is very quick!

data/lib/fiona7/controller_helper.rb

@@ -1,7 +1,11 @@
+require 'scrivito/controller_helper'
 require 'fiona7/in_editable_view'
+require 'fiona7/current_user_map'
 
 module Fiona7
   module ControllerHelper
+    include Scrivito::ControllerHelper
+    include Fiona7::CurrentUserMap
     include InEditableView
 
     def self.included(base)

data/lib/fiona7/current_user_map.rb

@@ -0,0 +1,20 @@
+module Fiona7
+  module CurrentUserMapHelper
+    def self.groups_for_user(user)
+      user_name = user.id rescue ""
+      Reactor::Cache::User.instance.get(user_name).groups
+    rescue => e
+      Rails.logger.error "Error occured reading user groups of #{user_name} (#{e.message})"
+      []
+    end
+  end
+
+  module CurrentUserMap
+    protected
+    def current_user
+      @current_user ||= OpenStruct.new({
+        :live_server_groups => CurrentUserMapHelper.groups_for_user(scrivito_user)
+      })
+    end
+  end
+end

data/lib/fiona7/editing_env_check.rb

@@ -2,21 +2,32 @@ module Fiona7
   class EditingEnvCheck
     def initialize(env)
       self.env = env
+      self.editing_context = self.env[Scrivito::EditingContextMiddleware::ENVKEY]
     end
 
-    def check?
-      editing_context = self.env[Scrivito::EditingContextMiddleware::ENVKEY]
-      editing_context && editing_context.authenticated_editor? && selected_workspace_id(editing_context) == 'rtc'
+    def rtc_selected?
+      editing_context && editing_context.authenticated_editor? && selected_workspace_id == 'rtc'
+    end
+
+    def editing_mode?
+      rtc_selected? && editing_context && editing_context.authenticated_editor? && selected_display_mode == 'editing'
     end
 
     protected
     attr_accessor :env
+    attr_accessor :editing_context
 
     private
-    def selected_workspace_id(editing_context)
+    def selected_workspace_id
+      # NOTE: this does not require workspace lookup/load_obj
+      # and thus is potentially faster
+      self.editing_context.instance_variable_get(:@selected_workspace_id).to_s
+    end
+
+    def selected_display_mode
       # NOTE: this does not require workspace lookup/load_obj
       # and thus is potentially faster
-      editing_context.instance_variable_get(:@selected_workspace_id).to_s
+      self.editing_context.instance_variable_get(:@display_mode).to_s
     end
   end
 end

data/lib/fiona7/engine.rb

@@ -32,6 +32,7 @@ require "fiona7/scrivito_patches/cms_routing"
 require "fiona7/scrivito_patches/layout_tags"
 require "fiona7/scrivito_patches/link_parser"
 require "fiona7/scrivito_patches/migrator"
+require "fiona7/scrivito_patches/obj_data_from_rest"
 require "fiona7/scrivito_patches/page_config"
 require "fiona7/scrivito_patches/type_computer"
 require "fiona7/scrivito_patches/workspace"

data/lib/fiona7/fiona_connector_patches/cms_accessible.rb

@@ -19,7 +19,7 @@ module RailsConnector
 
     # allow unreleased objects in editing mode
     def ensure_object_is_active
-      return true if Fiona7::EditingEnvCheck.new(request.env).check?
+      return true if Fiona7::EditingEnvCheck.new(request.env).rtc_selected?
 
       unless @obj.active?
         @valid_from = @obj.valid_from

data/lib/fiona7/scrivito_patches/obj_data_from_rest.rb

@@ -0,0 +1,30 @@
+require 'scrivito/backend/obj_data_from_rest'
+
+module Scrivito
+  module Backend
+    class ObjDataFromRest
+      private
+      # nil values for links are handled incorrectly
+      def legacy_compatible(value, type)
+        if type == "linklist"
+          value.map(&method(:legacy_link)).compact
+        elsif type == "link"
+          legacy_link(value)
+        else
+          value
+        end
+      end
+
+      # nil values for links are handled incorrectly
+      def legacy_link(link)
+        return nil unless link
+        return link unless link["obj_id"]
+
+        transformed = link.dup
+        transformed["destination"] = transformed.delete("obj_id")
+
+        transformed
+      end
+    end
+  end
+end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.71.0.6"
+  VERSION = "0.71.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.71.0.6
+  version: 0.71.0.7
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -182,6 +182,7 @@ files:
 - lib/fiona7/controllers/rest_api/blob_controller.rb
 - lib/fiona7/controllers/rest_api/obj_controller.rb
 - lib/fiona7/controllers/rest_api/workspace_controller.rb
+- lib/fiona7/current_user_map.rb
 - lib/fiona7/editing_env_check.rb
 - lib/fiona7/engine.rb
 - lib/fiona7/fiona_connector_patches/basic_obj.rb
@@ -227,6 +228,7 @@ files:
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/migrator.rb
 - lib/fiona7/scrivito_patches/obj_class.rb
+- lib/fiona7/scrivito_patches/obj_data_from_rest.rb
 - lib/fiona7/scrivito_patches/page_config.rb
 - lib/fiona7/scrivito_patches/type_computer.rb
 - lib/fiona7/scrivito_patches/workspace.rb