infopark_fiona7 0.71.1.0 → 0.71.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aaff7962c5f0c2bdce5d3856198cdab579fd8ac
-  data.tar.gz: cd04d39d77dc5bf489ff07becaff1e2c1ab20eb1
+  metadata.gz: 6138dff9bbb3210c8e77bb4b11d3972134f83954
+  data.tar.gz: 10aece82213930a7034b49dd23b6a74bfc5586d6
 SHA512:
-  metadata.gz: abe935f615d9b6b4bdd548c3f3f9e194ece6f54531bc1c425e81b608cc1cca8bedcc6dc6f3e64cbfdab30dc9d49394f095a27f8c98dba1f38bbc99672a5a28d4
-  data.tar.gz: e8879992375f4b647a9a0b60ed6140a3d351f1c5bfc3591e796c77645756786ba8052ccbe877a70f7538095f317d0f79a33b3105b53b6ef3f05feaff0edfb3ea
+  metadata.gz: 97616528eb79c32a0f34b4ffe12ab72632baf778cb5baa26299d461b36c697b5b796ebc3c5de95b9191ee7a2c0eb36c40737205b5500b59d9ea61bfff7bcad12
+  data.tar.gz: 53f3de235ab3adc20b6693758da37db68dd09f6577d5236726917fea813d6415ee4c0c9ca20a853857ff234b499e1324abbb3d6fd3062b4160a09b07129625e6

data/app/assets/javascripts/fiona7_ui.js

@@ -165,6 +165,10 @@
           if (action == 'release' && !obj.modification()) {
             return scrivito.t('commands.release_obj.not_modified_obj');
           } 
+          if (action == 'release' && obj.has_restriction()) {
+            return obj.restriction_messages().join("; ");
+
+          }
         },
 
         update: function() {
@@ -177,7 +181,7 @@
             scrivito.with_saving_overlay(scrivito.ajax('PUT', 'objs/' + obj.id() + '/release?comment=' + (comment || "")).then(function() {
               scrivito.reload();
             }).fail(function(error) {
-              scrivito.alert_dialog(scrivito.t('commnds.'+action+'_obj.failed'));
+              scrivito.alert_dialog(scrivito.t('commands.'+action+'_obj.failed'));
             }));
           });
         }
@@ -194,23 +198,6 @@
 
   return;
 
-  /* patch the create page command to not create incomprehensible paths */
-  scrivito.child_list_element.create_instance = function(cms_element) {
-    var ret = original_create_instance.call(this, cms_element);
-    if (typeof ret === "object") {
-      ret.create_child = function(obj_class) {
-        var path = (cms_element.path() + '/' + obj_class).replace(/\/\//g, "/");
-
-        return scrivito.obj.create({
-          _path: path,
-          _obj_class: obj_class
-        });
-      };
-    }
-    return ret;
-  };
-
-
   /* enforce permissions */
   var originalGuiStart = scrivito.gui.start;
   scrivito.gui.start = function () {

data/app/controllers/fiona7/release_controller.rb

@@ -32,12 +32,12 @@ module Fiona7
     end
 
     def recursively_find_objects(set, obj, already_encountered)
-      # already_encountered prevents loops
+      # substract already_encountered to prevent loops
       widgets_of_this_object = widgets(obj) - already_encountered
       referenced_objects_of_this_object = referenced_objects(obj) - already_encountered
 
       already_encountered.merge(widgets_of_this_object)
-      already_encountered.merge(referenced_objects_from_widgets)
+      already_encountered.merge(referenced_objects_of_this_object)
 
       widgets_of_this_object.each do |widget|
         recursively_find_objects(set, widget, already_encountered)
@@ -63,11 +63,14 @@ module Fiona7
       referenced = Set.new
 
       type_definition = Fiona7::TypeRegister.instance.read_mangled(obj.obj_class)
-      type_definition.attributes.each do |attribute|
-        if attribute.type == :reference || attribute.type == :referencelist
+      type_definition.attrs.each do |attribute|
+        if attribute.type == :reference || attribute.type == :referencelist && attribute.name != "child_order"
           (obj[attribute.real_name] || []).each do |link|
             if link.internal?
-              referenced << link.destination_object
+              destination_object = link.destination_object
+              if destination_object && (destination_object.image? || destination_object.generic?)
+                referenced << link.destination_object
+              end
             end
           end
         end

data/lib/fiona7/builder/obj_builder.rb

@@ -24,7 +24,7 @@ module Fiona7
         @values.delete(:_modification)
         # revert command sends this info. which is silly.
         @values.delete(:_last_changed)
-        puts "CREATING/UPDATING: #{@values.inspect}"
+        #puts "CREATING/UPDATING: #{@values.inspect}"
       end
 
       def build

data/lib/fiona7/json/obj_decorator.rb

@@ -87,7 +87,11 @@ module Fiona7
               {id: "%032d" % @obj.id.to_s}
             end
           when :enum, :multienum, :text, :string
-            @obj[real_attribute_name]
+            if real_attribute_name == "suppress_export"
+              @obj[real_attribute_name].to_s
+            else
+              @obj[real_attribute_name]
+            end
           when :stringlist
             if Fiona7.mode == :legacy && real_attribute_name == "channels"
               @obj["channels"] || []

data/lib/fiona7/scrivito_user.rb

@@ -36,6 +36,8 @@ module Fiona7
           obj = Fiona7::WriteObj.find_by_path(path)
           if !obj || !obj.permission.release?(rsession_user.user_name)
             I18n.t(:"fiona7.publish_permission_resticted", path: path)
+          elsif obj && !obj.valid?(:release)
+            obj.errors.join("\n")
           end
         end
       end

data/lib/fiona7/type_loader.rb

@@ -31,6 +31,7 @@ module Fiona7
         type_definition.add_attr('valid_from', :date, 'valid_from', :date)
         type_definition.add_attr('valid_until', :date, 'valid_until', :date)
         type_definition.add_attr('channels', :stringlist, 'channels', :stringlist)
+        type_definition.add_attr('suppress_export', :enum, 'suppress_export', :enum, ['0', '1'])
 
         if self.rc_obj_class.obj_type == 'publication' || self.rc_obj_class.obj_type == 'document'
           type_definition.add_attr('body', :html, 'body', :html)

data/lib/fiona7/type_synchronizer.rb

@@ -45,7 +45,7 @@ module Fiona7
 
     def builder_attributes
       self.type_definition.attrs.map do |attribute_definition|
-        next if ['title', 'blob', 'body', 'valid_from', 'valid_until', 'channels'].include?(attribute_definition.real_name)
+        next if ['title', 'blob', 'body', 'valid_from', 'valid_until', 'channels', 'suppress_export'].include?(attribute_definition.real_name)
 
         desc = {
           real_name: attribute_definition.real_name,

data/lib/fiona7/verity_search_engine.rb

@@ -64,47 +64,44 @@ module Fiona7
 
       def build_query_string(query)
         query = normalize_query(query)
-        if full_text_query?(query)
-          full_text_query_string(extract_words(query))
-        else
-          complex_query_string(query)
-        end
-      end
-
-      def full_text_query?(query)
-        query.any? {|q| q[:field] == :'*' && (q[:operator] == :prefix_search || q[:operator] == :search)}
+        complex_query_string(query)
       end
 
       def complex_query_string(query)
         conditions = query.map do |q|
-          if q[:field] == :'*'
-            Rails.logger.error("Unexpected field * when processing search request: #{q.inspect}")
-            next
-          end
-
-          resolved_field = resolve_field_name(q[:field])
+          unresolved_field = q[:field]
+          resolved_field = resolve_field_name(unresolved_field)
 
           # paths are sadly not in the search index.
           next if resolved_field == :visiblePath
 
           case q[:operator]
           when :equal
-            if q[:field] == :_modification
+            if unresolved_field == :_modification
               '("edited" <#IN> state)'
             else
               field_operator_value(resolved_field, "=", q[:value])
             end
           when :search
-            field_operator_value(resolved_field, "<#CONTAINS>", q[:value])
+            if unresolved_field == :'*'
+              full_text_query_string(as_values_array(q[:value]))
+            else
+              field_operator_value(resolved_field, "<#CONTAINS>", q[:value])
+            end
           when :greater_than
             field_operator_value(resolved_field, ">", q[:value])
           when :less_than
             field_operator_value(resolved_field, "<", q[:value])
           when :prefix, :prefix_search
-            values = q[:value]
-            values = [values] unless values.kind_of?(Array)
-            values.map {|v| "#{v}*" }
-            values_operator_field(values, "<#IN>", resolved_field)
+            if unresolved_field == :'*'
+              values = as_values_array(q[:value])
+              values = values.map {|v| "#{v}*" }
+              full_text_query_string(values)
+            else
+              values = as_values_array(q[:value])
+              values = values.map {|v| "#{v}*" }
+              values_operator_field(values, "<#IN>", resolved_field)
+            end
           else
             raise "Operator: #{q[:operator]} not supported"
           end
@@ -171,7 +168,12 @@ module Fiona7
         end
       end
 
-      def extract_words(query)
+      def as_values_array(values)
+        values = [values] unless values.kind_of?(Array)
+        values
+      end
+
+      def extract_words(q)
         q = query.find {|q| q[:field] == :'*' && (q[:operator] == :prefix_search || q[:operator] == :search) }
         if q[:value].kind_of?(Array)
           q[:value]

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.71.1.0"
+  VERSION = "0.71.1.1"
 end

data/lib/fiona7/widget_resolver.rb

@@ -24,13 +24,20 @@ module Fiona7
       self.id_map = widget_id_to_object_id_map.dup
       self.path_map = Hash[
         widget_id_to_object_id_map.map {|widget_id, obj_id|
-          [widget_id, object_id_to_widget_instance_map[obj_id].path]
-        }
+          path = object_id_to_widget_instance_map[obj_id].try(:path)
+          next unless path
+          [widget_id, object_id_to_widget_instance_map[obj_id].try(:path)]
+        }.compact
       ]
       self.instance_map = Hash[
         widget_id_to_object_id_map.map {|widget_id, obj_id|
-          [widget_id, object_id_to_widget_instance_map[obj_id]]
-        }
+          object = object_id_to_widget_instance_map[obj_id]
+          if !object
+            Rails.logger.error("Unable to find widget with id #{widget_id} (obj_id = #{obj_Id})")
+            next
+          end
+          [widget_id, object]
+        }.compact
       ]
     end
   end

data/lib/fiona7/workspace.rb

@@ -26,7 +26,7 @@ module Fiona7
 
     def title
       if self.id == :rtc
-        'Edited'
+        'Arbeitskopie'
       else
         nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.71.1.0
+  version: 0.71.1.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails