infopark_fiona7 0.71.0.0 → 0.71.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b01a9b4b8f32420a4dbc9a71b7715e4b435064fe
-  data.tar.gz: 52cd4e1ead233d6687abea23efc30c8356a34fcd
+  metadata.gz: 63d211ac7f8286b5fac42e153b9910ebab860441
+  data.tar.gz: ec3f22cb8839b5f4678de0ec2ecf2573ebf1fa91
 SHA512:
-  metadata.gz: 43a8472b368e2b0c97215dc78a9695b3b163b20fbda466b5be8661bbbe1ee245ad265b475758c78b1595d43964c34f9d450e4d1faf42272bd33b0e439f973b03
-  data.tar.gz: 7f7076b7cc9d09f4fb082b9a19776ceb98132c78c1d425cc17e021091f229056aee960cf222604ee97895e4ea390f2598e4c85bd36b66f1b5a8be7f5a465f9e4
+  metadata.gz: 880363e8a0a340d748e40cb70f9b705bb953408ecb3771a6439aac33c2db56de9dda6db9c81025da442d6ba15805f2599154abbf692c4fdaf30174982583621f
+  data.tar.gz: da276d868c7e1b8f9380621a1bcaa512664d6e74bd6aec57bf90bc2615f0211d6f5d61b2bed8a21d6a01befaeb62181660d50446b843b1df525bad6fe31b4197

data/app/assets/javascripts/fiona7_ui.js

@@ -157,7 +157,7 @@
         icon: icons[action],
 
         present: function() {
-          return scrivito.editing_context.selected_workspace.is_editable() && obj && !obj.is_deleted() && scrivito.user_permissions.can(action + '_obj');
+          return scrivito.editing_context.selected_workspace.is_editable() && obj;// && !obj.is_deleted() && scrivito.user_permissions.can(action + '_obj');
         },
 
         disabled: function() {
@@ -184,9 +184,9 @@
     });
 
 
-    var menu = cms_document.menu();
-    menu.push(scrivito.command_separator.create_instance({id: 'fiona7.zz_sparator'}));
-    cms_document.set_menu(menu);
+    //var menu = cms_document.menu();
+    //menu.push(scrivito.command_separator.create_instance({id: 'fiona7.zz_sparator'}));
+    //cms_document.set_menu(menu);
 
     //scrivito.configure_menu_order(['fiona7.*', '*']);
   });

data/app/assets/javascripts/scrivito_patches/models/obj.js

@@ -73,6 +73,10 @@
             return params.last_changed;
           },
 
+          provided_path: function() {
+            return params.path;
+          },
+
           parent_path: function() {
             return params.parent_path;
           },
@@ -198,6 +202,7 @@
 
       create: function(attrs) {
         return prepare_attrs(scrivito.random_id(), attrs).then(function(prepared_attrs) {
+          provide_default_path(prepared_attrs, prepared_attrs._obj_class);
           return persist_obj_data(prepared_attrs).then(function (data) {
             scrivito.obj_class_selection.store(prepared_attrs._obj_class);
             return scrivito.obj.create_instance(data);
@@ -215,6 +220,17 @@
     }
   });
 
+  var provide_default_path = function (attrs, default_name) {
+    if (!(attrs._path)) {
+      var current_page = scrivito.application_document().page();
+      var path = (typeof current_page.provided_path === 'function') && current_page.provided_path();
+
+      if (path && path !== "/") {
+        attrs._path =  path + "/" + default_name;
+      }
+    }
+  };
+
   var obj_url = function (obj_id) {
     var url = window.location.protocol + '//' + window.location.host + '/__scrivito/objs';
     if (typeof obj_id !== 'undefined') {

data/app/models/fiona7/released_obj.rb

@@ -14,9 +14,11 @@ module Fiona7
       end
     else
       # suppress_export can be misused in legacy mode
+      # also valid_from and valid_until should be handled
+      # by the application
       default_scope do
         now = Time.now.utc.to_iso
-        where("is_released = 1").where('obj_class NOT IN (?)', ['X_Generic', 'X_Image', 'X_Container']).where("(valid_from IS NULL or valid_from <= :now) and (valid_until IS NULL or valid_until >= :now)", :now => now)
+        where("is_released = 1").where('obj_class NOT IN (?)', ['X_Generic', 'X_Image', 'X_Container'])#.where("(valid_from IS NULL or valid_from <= :now) and (valid_until IS NULL or valid_until >= :now)", :now => now)
       end
     end
 

data/lib/fiona7/builder/obj_builder.rb

@@ -99,6 +99,7 @@ module Fiona7
             end
 
           end
+
         end
       end
 
@@ -253,6 +254,7 @@ module Fiona7
             raise Scrivito::ClientError.new("Unknown attribute type: #{virtual_type}", 418)
           end
         end
+        @obj.set(:X_full_text, rewrite_full_text) if @new_widget_pool
         @obj.set(:X_widget_pool, @new_widget_pool) if @new_widget_pool
         @obj.set(:permalink, @permalink) if @permalink
 
@@ -283,8 +285,12 @@ module Fiona7
         end
       end
 
-
-
+      def rewrite_full_text
+        full_text = ::JSON.parse(@obj.attr_values["X_full_text"]) rescue {}
+        full_text["_widget_pool"] ||= {}
+        full_text["_widget_pool"].deep_merge!(@widget_pool)
+        full_text.to_json
+      end
 
       def upload_file(file)
         # only publication type can contain children (code = "5")

data/lib/fiona7/builder/obj_class_builder.rb

@@ -78,7 +78,7 @@ module Fiona7
         @raw_obj_class = Reactor::Cm::ObjClass.create(@values[:name].to_s, @values[:type].to_s)
         user_attributes = @attributes.map {|a| a[:real_name] }
         user_attributes ||= []
-        built_in_attributes = ['X_widget_pool']
+        built_in_attributes = Fiona7::Initializer::ATTRIBUTES_MAP.keys
         @raw_obj_class.attributes = user_attributes + built_in_attributes
       end
 

data/lib/fiona7/builder/obj_class_updater.rb

@@ -19,7 +19,7 @@ module Fiona7
         user_attributes ||= []
 
         existing_attributes = @raw_obj_class.attributes
-        built_in_attributes = ['X_widget_pool']
+        built_in_attributes = Fiona7::Initializer::ATTRIBUTES_MAP.keys
 
         # NOTE: removing attributes is now impossible
         new_attributes = (existing_attributes + built_in_attributes + user_attributes).map(&:to_s).uniq

data/lib/fiona7/controller_helper.rb

@@ -0,0 +1,20 @@
+module Fiona7
+  module ControllerHelper
+    def editing_context
+      Scrivito::EditingContextMiddleware.from_request(request)
+    end
+
+    def scrivito_in_editable_view?
+      editing_context.editable_display_mode?
+    end
+
+    def fiona7_in_editable_view?
+      scrivito_in_editable_view?
+    end
+
+    def self.included(base)
+      base.send(:helper_method, :scrivito_in_editable_view?)
+      base.send(:helper_method, :fiona7_in_editable_view?)
+    end
+  end
+end

data/lib/fiona7/controllers/rest_api/blob_controller.rb

@@ -4,7 +4,7 @@ module Fiona7
       class BlobController
         def fetch(blob_id, transformation=false)
           public_get_url = BinaryHandling::UrlGenerator.new(blob_id, 'public_access', 'get', transformation).generate
-          # all URLs are identic!
+          # all URLs are identical!
           # private_get_url = BinaryHandling::UrlGenerator.new(blob_id, 'private_access', 'get', false).generate
           # public_head_url = BinaryHandling::UrlGenerator.new(blob_id, 'public_access', 'head', false).generate
           # private_head_url = BinaryHandling::UrlGenerator.new(blob_id, 'private_access', 'head', false).generate
@@ -33,8 +33,14 @@ module Fiona7
           meta_binary = BinaryHandling::MetaBinary.new(blob_id)
           content_type = meta_binary.mime_type
           content_length = meta_binary.length
-          width = meta_binary.width
-          height = meta_binary.height
+
+          if meta_binary.image?
+            width = meta_binary.width
+            height = meta_binary.height
+          else
+            width = 0
+            height = 0
+          end
           {
             'meta_data' => {
               'content_type' => ['string', content_type],

data/lib/fiona7/engine.rb

@@ -13,21 +13,26 @@ require "infopark_fiona_connector"
 #require "rails_connector/fiona_engine" 
 require "infopark_reactor"
 
+require "fiona7/initializer"
 require "fiona7/mode_switch"
+require "fiona7/controller_helper"
 require "fiona7/scrivito_patches/attribute_content"
 require "fiona7/scrivito_patches/attribute_serializer"
 require "fiona7/scrivito_patches/basic_obj"
 require "fiona7/scrivito_patches/basic_widget"
 require "fiona7/scrivito_patches/binary"
 require "fiona7/scrivito_patches/cms_backend"
+require "fiona7/scrivito_patches/child_list_tag"
 require "fiona7/scrivito_patches/cms_field_tag"
 require "fiona7/scrivito_patches/controller_actions"
 # different load order !!
 #require "fiona7/scrivito_patches/cms_dispatch_controller"
 require "fiona7/scrivito_patches/cms_rest_api"
 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/page_config"
 require "fiona7/scrivito_patches/type_computer"
 require "fiona7/scrivito_patches/workspace"
 
@@ -115,7 +120,6 @@ module Fiona7
 
     config.to_prepare do
       # TODO: do some smart optimizations
-      require "fiona7/initializer"
       initializer = Fiona7::Initializer.new
       initializer.initialize_system
     end
@@ -155,7 +159,6 @@ module Fiona7
     end
 
     initializer "fiona7.authorize_reactor" do |app|
-
       ActionController::Base.__send__(:define_method, :rsession_auth) do
         if !Fiona7.login
           rsession.user_name = Fiona7.root unless rsession.user_name == Fiona7.root

data/lib/fiona7/initializer.rb

@@ -6,8 +6,20 @@ module Fiona7
       'X_Container'    => 'publication'
     }
 
+    CLASSES_TITLE_MAP = {
+      'X_Generic'      => {'Binärdatei (Systemvorlage)' => {'lang' => 'de'}, 'Binary file (system class)' => {'lang' => 'en'}},
+      'X_Image'        => {'Bilddatei (Systemvorlage)' => {'lang' => 'de'}, 'Image file (system class)' => {'lang' => 'en'}},
+      'X_Container'    => {'Container (Systemvorlage)' => {'lang' => 'de'}, 'Contaienr (system class)' => {'lang' => 'en'}}
+    }
+
     ATTRIBUTES_MAP = {
-      'X_widget_pool'  => 'linklist'
+      'X_widget_pool'  => 'linklist',
+      'X_full_text'    => 'text'
+    }
+
+    ATTRIBUTES_TITLE_MAP = {
+      'X_widget_pool'  => {'Verlinkte Widgets (Systemfeld)' => {'lang' => 'de'}, 'Linked widgets (system field)' => {'lang' => 'en'}},
+      'X_full_text'    => {'Hauptinhalt für die Suchmaschine (Systemfeld)' => {'lang' => 'de'}, 'Body for search engine (system field)' => {'lang' => 'en'}}
     }
 
     def initialize_system
@@ -36,18 +48,26 @@ module Fiona7
         any_attribute_present ||= attribute && attribute.attribute_type == type
       end
 
-      any_class_present && raise("Misconfiguration of attributes detected")
+      any_attribute_present && raise("Misconfiguration of attributes detected")
 
       return true
     end
 
     def classes_and_attributes
       CLASSES_MAP.each do |name, type|
-        Reactor::Cm::ObjClass.create(name, type)
+        obj_class = Reactor::Cm::ObjClass.create(name, type)
+        obj_class.set(:title, CLASSES_TITLE_MAP[name])
+        obj_class.save!
       end
 
       ATTRIBUTES_MAP.each do |name, type|
-        Reactor::Cm::Attribute.create(name, type)
+        attribute = Reactor::Cm::Attribute.create(name, type)
+        attribute.set(:title, ATTRIBUTES_TITLE_MAP[name])
+        if (type == 'text')
+          attribute.set(:isSearchableInCM, 1)
+          attribute.set(:isSearchableInTE, 1)
+        end
+        attribute.save!
       end
     end
 
@@ -56,7 +76,7 @@ module Fiona7
         valid_sub_obj_classes = read_valid_sub_obj_classes(obj_class)
 
         # empty valid_sub_obj_classes = allow all
-        unless valid_sub_obj_classes.empty?
+        unless valid_sub_obj_classes.empty? || CLASSES_MAP.keys.all? {|obj_class| valid_sub_obj_classes.include?(obj_class) }
           valid_sub_obj_classes += CLASSES_MAP.keys
           cm_class = Reactor::Cm::ObjClass.get(obj_class.name)
           cm_class.set(:validSubObjClasses, valid_sub_obj_classes)

data/lib/fiona7/permission_volatile_cache.rb

@@ -0,0 +1,28 @@
+module Fiona7
+  class PermissionVolatileCache
+    PERMISSION_KEY = "F7PERMISSION_CACHE"
+
+    def initialize(request)
+      request[PERMISSION_KEY] ||= {}
+      self.storage = request[PERMISSION_KEY]
+    end
+
+    def permitted?(user_name, obj_id, action)
+      self.storage["#{user_name}:#{obj_id}:#{action}"] ||= lookup(user_name, obj_id, action)
+    end
+
+    protected
+    attr_accessor :storage
+
+    def lookup(user_name, obj_id, action)
+      return false unless user_name && obj_id && action
+
+      obj = Fiona7::EditedObj.new
+      obj.obj_id = obj_id.to_i
+      return obj.permission.send(:"#{action}?", user_name)
+    rescue Reactor::Cm::XmlSingleRequestError => e
+      Rails.logger.error("Error looking up the permission of #{user_name} for obj #{obj_id} for action #{action}:\n#{e.message}")
+      return false
+    end
+  end
+end

data/lib/fiona7/permitted_mixin.rb

@@ -0,0 +1,11 @@
+require 'fiona7/permission_volatile_cache'
+
+module Fiona7
+  module PermittedMixin
+    protected
+    def permitted?(user_name, obj_id, action)
+      @permission_cache ||= Fiona7::PermissionVolatileCache.new(view.request)
+      @permission_cache.permitted?(user_name, obj_id, action)
+    end
+  end
+end

data/lib/fiona7/scrivito_patches/binary.rb

@@ -73,6 +73,10 @@ module Fiona7
           self.obj.body_length
         end
 
+        def image?
+          self.obj.image?
+        end
+
         def width
           self.cache("#{self.last_changed}-width") do
             if self.image
@@ -213,7 +217,7 @@ module Fiona7
       delegate :valid?, :present?,
         :filename, :filepath,
         :mime_type, :length, :last_changed,
-        :width, :height,
+        :image?, :width, :height,
         :to => :implementation
 
       def initialize(binary_id, transformation=false)

data/lib/fiona7/scrivito_patches/child_list_tag.rb

@@ -0,0 +1,16 @@
+require 'scrivito/child_list_tag'
+require 'fiona7/permitted_mixin'
+
+module Scrivito
+  class ChildListTag
+    include Fiona7::PermittedMixin
+
+    private
+    # add permission checking
+    def user_present?
+      view.scrivito_user.present? &&
+        (permitted?(view.scrivito_user.id, obj.id, :root) ||
+         permitted?(view.scrivito_user.id, obj.id, :create_children))
+    end
+  end
+end

data/lib/fiona7/scrivito_patches/cms_field_tag.rb

@@ -1,7 +1,10 @@
 require 'scrivito/cms_field_tag'
+require 'fiona7/permitted_mixin'
 
 module Scrivito
   class CmsFieldTag
+    include Fiona7::PermittedMixin
+
     # support shadowclassing
     def build_valid_widget_classes
       obj_or_widget.valid_widget_ruby_classes_for(field_name).map do |widget_class|
@@ -14,6 +17,26 @@ module Scrivito
         }
       end
     end
+
+
+    private
+    # add permission checking
+    def authenticated_editor?
+      editing_context.authenticated_editor? &&
+        (permitted?(editing_context.editor.id, obj_not_widget_id, :root) ||
+         permitted?(editing_context.editor.id, obj_not_widget_id, :write))
+    end
+
+    def obj_not_widget_id
+      case obj_or_widget
+      when Scrivito::BasicObj
+        obj_or_widget.id
+      when Scrivito::BasicWidget
+        obj_or_widget.obj.id
+      else
+        raise ScrivitoError, "Expected an Obj or Widget to be passed to scrivito_tag, but #{obj_or_widget.class.name} received"
+      end
+    end
   end
 end
 

data/lib/fiona7/scrivito_patches/layout_tags.rb

@@ -0,0 +1,10 @@
+require 'scrivito/layout_tags'
+
+module Scrivito
+  class LayoutTags
+    def generator_meta_tag
+      content = 'Fiona 7 by Infopark AG (infopark.de)'
+      view.tag(:meta, name: 'generator', content: content)
+    end
+  end
+end

data/lib/fiona7/scrivito_patches/page_config.rb

@@ -0,0 +1,21 @@
+require 'scrivito/page_config'
+
+module Scrivito
+  class PageConfig
+    def current_page_config
+      # TODO: add permission info
+      return {} unless obj
+      {
+        id: obj.id,
+        path: obj.path,
+        obj_class: obj.obj_class,
+        has_children: obj.children.any?,
+        has_conflict: obj.has_conflict?,
+        has_details_view: obj_has_details_view?,
+        modification: modification(obj),
+        parent_path: obj.parent_path,
+        restriction_messages: editor.restriction_messages_for(obj),
+      }
+    end
+  end
+end

data/lib/fiona7/type_loader.rb

@@ -40,7 +40,7 @@ module Fiona7
       end
 
       self.rc_obj_class.custom_attributes.each do |real_name, cms_attribute|
-        next if real_name == 'X_widget_pool'
+        next if Fiona7::Initializer::ATTRIBUTES_MAP.key?(real_name)
 
         # TODO: move this to a better place
         if Fiona7.mode == :standalone

data/lib/fiona7/type_register.rb

@@ -204,6 +204,11 @@ module Fiona7
           true
         when [:text, :string]
           true
+        when [:string, :enum]
+          # this case can occur when an enum
+          # was initially ad-hoc created, but now
+          # has a proper definition
+          true
         else
           #raise "Attribute types for #{attr_name} incompatible: CMS uses #{cms_type} but the application provided #{usr_type}"
           puts "Attribute types for #{attr_name} incompatible: CMS uses #{cms_type} but the application provided #{usr_type}"

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.71.0.0"
+  VERSION = "0.71.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.71.0.0
+  version: 0.71.0.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,6 +174,7 @@ files:
 - lib/fiona7/builder/widget_builder.rb
 - lib/fiona7/builder/widget_building.rb
 - lib/fiona7/builder/widget_updater.rb
+- lib/fiona7/controller_helper.rb
 - lib/fiona7/controllers/content_service/obj_controller.rb
 - lib/fiona7/controllers/content_service/workspace_controller.rb
 - lib/fiona7/controllers/rest_api/blob_controller.rb
@@ -199,6 +200,8 @@ files:
 - lib/fiona7/mode_switch/composite.rb
 - lib/fiona7/mode_switch/views.rb
 - lib/fiona7/naive_search_engine.rb
+- lib/fiona7/permission_volatile_cache.rb
+- lib/fiona7/permitted_mixin.rb
 - lib/fiona7/recursive_link_resolver.rb
 - lib/fiona7/routers/content_service.rb
 - lib/fiona7/routers/rest_api.rb
@@ -208,15 +211,18 @@ files:
 - lib/fiona7/scrivito_patches/basic_obj.rb
 - lib/fiona7/scrivito_patches/basic_widget.rb
 - lib/fiona7/scrivito_patches/binary.rb
+- lib/fiona7/scrivito_patches/child_list_tag.rb
 - lib/fiona7/scrivito_patches/client_config.rb
 - lib/fiona7/scrivito_patches/cms_backend.rb
 - lib/fiona7/scrivito_patches/cms_field_tag.rb
 - lib/fiona7/scrivito_patches/cms_rest_api.rb
 - lib/fiona7/scrivito_patches/cms_routing.rb
 - lib/fiona7/scrivito_patches/controller_actions.rb
+- lib/fiona7/scrivito_patches/layout_tags.rb
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/migrator.rb
 - lib/fiona7/scrivito_patches/obj_class.rb
+- lib/fiona7/scrivito_patches/page_config.rb
 - lib/fiona7/scrivito_patches/type_computer.rb
 - lib/fiona7/scrivito_patches/workspace.rb
 - lib/fiona7/scrivito_user.rb