infopark_fiona7 1.6.1.1.1 → 1.6.1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8619bcb34e8b06c4499cce99ce0cad5609cc5691
-  data.tar.gz: 2d10b5a8e74cfc9139ff9d10f27e7a478da66645
+  metadata.gz: 80b1c27d1b674276a829a3cb2fcb5320426af57b
+  data.tar.gz: 48a1c5073d802b1fe7af7cd8e376697efc1d1ffa
 SHA512:
-  metadata.gz: 2da3e5d4a375674f33e7f8003eb5bdf85e6a1a48c83c74abcd92fcacbbe7d152ba8f4b2b49d76d80bfa8e60d5f59e30861992f3afcd7d6a4288e5ea56fd987b2
-  data.tar.gz: 81be495b06b82580e67a75c229d0eca2d8162813068b900b78e19b8119a1db931530fb51be78ee6701445869045de8e8d85bdf3086da9eb36d0bb3a16899d578
+  metadata.gz: ba4897faefd1d314ba41862e9805ffb6ae001aa7f0094293230d5a775cd744febfe1f909d0afd249e68b68e202601d01e6d8b8e452d42566cdd5efbfa6eaf47f
+  data.tar.gz: 3586cdf2d048de46b7d8a220dcb72aec6e1e57cce85de06f2a69e061a380c286ad50d10538d8509214388425ed241100166d3be9b448b8e1be7a5a09f468e974

data/app/assets/javascripts/fiona7_ui.js

@@ -149,6 +149,32 @@
     });
   };
 
+  var enable_workflow_buttons = function(document, obj, buttons, source_frame){
+    // TODO: add special handling for scrivito_details_dialog and scrivito_inspector
+    var button;
+
+    // remove redundant buttons
+    $.each(actions, function (idx, action) {
+      if (buttons.indexOf(action) === -1) {
+        $('[data-fiona7-private-workflow-button="' + action + '"]', document).addClass('disabled').hide();
+      } else {
+        $('[data-fiona7-private-workflow-button="' + action + '"]', document).removeClass('disabled').show();
+      }
+    });
+
+    // conditionally enable release button
+    // find the release button
+    button = $('[data-fiona7-private-workflow-button="release"]', document);
+    if (obj.has_restriction() || ( buttons.length > 0 && buttons.indexOf("release") === -1) ) {
+      // release impossible
+      button.attr('disabled');
+      button.addClass('disabled');
+    } else if( obj.modification() || ( buttons.length > 0 && buttons.indexOf("release") !== -1) ) {
+      button.removeAttr('disabled');
+      button.removeClass('disabled');
+    }
+  }
+
   scrivito.gui.on('document', function(cms_document) {
     var page_config      = (cms_document.page_config() || {})['current_page'] || {};
     var obj              = cms_document.page();
@@ -158,51 +184,40 @@
     var source_frame     = cms_document.browser_window();
 
     if (source_frame.name !== 'scrivito_application') {
-      // TODO: add special handling for scrivito_details_dialog and scrivito_inspector
-      var button;
-
-      // enable workflow buttons
-      $.each(buttons, function (idx, action) {
-        // release is handled differently
-        if (action === 'release') {
-          return;
-        }
-
-        // find the workflow button
-        button = $('[data-fiona7-private-workflow-button="' + action + '"]', cms_document.browser_window().document);
-
-        // enable given workflow button
-        button.removeAttr('disabled');
-        button.removeClass('disabled');
-        button.click(function () {
-          workflowAction(action, obj.id(), reloadGivenWindow(source_frame));
-        });
-
-      });
-
       // remove redundant buttons
       $.each(actions, function (idx, action) {
-        if (buttons.indexOf(action) === -1) {
-          $('[data-fiona7-private-workflow-button="' + action + '"]', cms_document.browser_window().document).remove();
-        }
+        $('[data-fiona7-private-workflow-button="' + action + '"]', cms_document.browser_window().document).click(function () {
+          if (buttons.indexOf(action) !== -1) {
+            workflowAction(action, obj.id(), reloadGivenWindow(source_frame));
+          }
+        });
       });
 
       // conditionally enable release button
       // find the release button
-      button = $('[data-fiona7-private-workflow-button="release"]', cms_document.browser_window().document);
-      if (obj.modification()) {
-        if (obj.has_restriction()) {
-          // release impossibru
-          button.attr('title', obj.restriction_messages().join("; "));
-        } else {
-          button.removeAttr('disabled');
-          button.removeClass('disabled');
-          button.click(function () {
-            releaseAction(obj.id(), reloadGivenWindow(source_frame));
-          });
+      $('[data-fiona7-private-workflow-button="release"]', cms_document.browser_window().document).click(function () {
+        if( obj.modification() || ( buttons.length > 0 && buttons.indexOf("release") !== -1) ) {
+          releaseAction(obj.id(), reloadGivenWindow(source_frame));
         }
+      });
+
+      enable_workflow_buttons( cms_document.browser_window().document, obj, buttons, source_frame );
+
+      var check_actions = function(){
+        scrivito.ajax('GET', 'objs/' + obj.id() + '/workflow/list').then( function( data ) {
+          if( !data || data.error ) {
+            return;
+          }
+          enable_workflow_buttons(cms_document.browser_window().document, obj, data.actions, source_frame );
+          buttons = data.actions;
+        });
       }
 
+      scrivito.write_monitor.on('end_write', function() {
+        if (!scrivito.write_monitor.is_writing()) {
+          check_actions();
+        }
+      });
       return;
     }
 
@@ -266,6 +281,14 @@
       });
     });
 
+    scrivito.on('load', function() {
+      scrivito.page_menu(cms_document).update("scrivito.sdk.save_obj_to_clipboard",{
+        disabled: function disabled() {
+          return false;
+        }
+      });
+    });
+
   });
 
   return;

data/app/assets/javascripts/scrivito_patches/client/ajax.js

@@ -15,6 +15,10 @@
           scrivito.write_monitor.start_write();
         }
       }
+      // perform link resolving synchronous
+      if (path == 'resolve_paths') {
+        options.async = false;
+      }
 
       var ajaxPromise = singleAjax(type, path, options).then(function (result) {
         if (result && result.task && _.size(result) === 1) {

data/app/controllers/fiona7/release_controller.rb

@@ -82,6 +82,9 @@ module Fiona7
           errors << error
         end
       end
+      if Fiona7.mode == :standalone
+        complex_object.check_binaries
+      end
       #complex_object.binaries.each do |widget_obj|
       #  widget_obj.take
       #  widget_obj.release!(comment)

data/app/controllers/fiona7/workflow_controller.rb

@@ -24,6 +24,20 @@ module Fiona7
       workflow_action('reject')
     end
 
+    def list
+      @obj = WriteObj.find(params[:id])
+      actions = []
+      if ::Fiona7.workflows_enabled? and @obj.workflow.present?
+        actions = @obj.send(:crul_obj).valid_actions 
+      else
+        actions = @obj.send(:crul_obj).valid_actions.select{ |a| ["release","edit"].include? a }
+      end
+      render json: { actions: actions }
+    rescue => e
+      Rails.logger.error("Error #{e.inspect} when executing valid_actions on #{@obj.id}")
+      render json: {message: e.message, message_for_editor: e.message}, status: 412
+    end
+
     protected
     def workflow_action(action)
       @obj     = WriteObj.find(params[:id])

data/config/precedence_routes.rb

@@ -22,6 +22,7 @@ Fiona7::Engine.routes.draw do
   put '/__scrivito/objs/workflow/commit(.:format)', to: 'fiona7/workflow#commit', as: :fiona7_workflow_commit
   put '/__scrivito/objs/workflow/sign(.:format)', to: 'fiona7/workflow#sign', as: :fiona7_workflow_sign
   put '/__scrivito/objs/workflow/reject(.:format)', to: 'fiona7/workflow#reject', as: :fiona7_workflow_reject
+  get '/__scrivito/objs/:id/workflow/list(.:format)', to: 'fiona7/workflow#list', as: :fiona7_workflow_list
 
 
   get '/__scrivito/objs/:id/release/preview(.:format)', to: 'fiona7/release#preview', as: :fiona7_release_preview

data/infopark_fiona7.gemspec

@@ -8,11 +8,11 @@ require "fiona7/version"
 Gem::Specification.new do |s|
   s.name        = "infopark_fiona7"
   s.version     = Fiona7::VERSION
-  s.authors     = ["Tomasz Przedmojski"]
-  s.email       = ["tomasz.przedmojski@infopark.de"]
+  s.authors     = ["Infopark AG"]
+  s.email       = ["support@infopark.de"]
   s.homepage    = "https://www.infopark.de"
-  s.summary     = "scrivito-compatible interface for classic Fiona"
-  s.description = "scrivito-compatible interface for classic Fiona"
+  s.summary     = "scrivito-compatible interface for Infopark CMS Fiona 7"
+  s.description = "scrivito-compatible interface for Infopark CMS Fiona 7"
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md", "infopark_fiona7.gemspec"].reject do |f|
     /^app\/assets.*\.es6\.js$/ =~ f ||
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"
-  s.add_dependency "infopark_reactor", ">= 1.25.0"
+  s.add_dependency "infopark_reactor", ">= 1.26.1"
   s.add_dependency "mini_magick"
   #s.add_development_dependency "ruby-prof"
   s.add_development_dependency "scrivito_development"

data/lib/fiona7/binary_files_cleaner.rb

@@ -0,0 +1,29 @@
+module Fiona7
+  module BinaryFilesCleaner
+
+    def delete_unused(binary)
+      perform_with_unused(binary, "delete!")
+    end
+    def unrelease_unused(binary)
+      perform_with_unused(binary, "unrelease!")
+    end
+
+    private
+    def perform_with_unused(binary, action)
+      blob_objs = Fiona7::WriteObj.where(obj_class: binary.obj_class, parent_obj_id: binary.parent_obj_id)
+      blob_objs.each do |blob_obj|
+        Rails.logger.info("Checking binary obj #{blob_obj.obj_id}")
+        if (!blob_obj.has_super_links? && blob_obj.obj_id != binary.obj_id)
+          # perform delete! without to check released?
+          if action == "delete!" ||  blob_obj.released?
+            Rails.logger.info("#{action} binary obj #{blob_obj.obj_id}")
+            Reactor::Sudo.su(Fiona7.root) do
+              blob_obj.send(:crul_obj).send(action)
+            end
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/fiona7/builder/lazy_blob_copier.rb

@@ -3,6 +3,7 @@ require 'fiona7/blob_id_generator'
 require 'fiona7/builder/indirect_blob_builder_for_obj'
 require 'fiona7/builder/container_chain_builder'
 require 'fiona7/upload_path_selector'
+require 'fiona7/binary_files_cleaner'
 
 module Fiona7
   module Builder
@@ -22,6 +23,8 @@ module Fiona7
     # NOTE: there is an exception to the above:
     # renaming a blob in standalone mode executes immediately
     class LazyBlobCopier
+      include Fiona7::BinaryFilesCleaner
+
       def initialize(attrs={})
         @destination_obj = attrs[:destination_obj]
         @attribute       = attrs[:attr_name]

data/lib/fiona7/builder/obj_updater.rb

@@ -49,7 +49,7 @@ module Fiona7
           # we first have to make sure that the new parent exists
           # FIXME: moving the object and changing the obj class
           # will not move the object
-          @obj.parent = ContainerChainBuilder.new(parent_path).call
+          @obj.send(:set_parent, ContainerChainBuilder.new(parent_path).call )
         end
       end
 

data/lib/fiona7/complex_object.rb

@@ -1,5 +1,9 @@
+require 'fiona7/binary_files_cleaner'
+
 module Fiona7
   class ComplexObject
+    include Fiona7::BinaryFilesCleaner
+
     def initialize(obj)
       @obj = obj
     end
@@ -11,14 +15,24 @@ module Fiona7
     end
 
     def binaries
+      referenced = []
       type_definition = Fiona7::TypeRegister.instance.read_mangled(@obj.obj_class)
       type_definition.attrs.each do |attribute|
         if attribute.type == :binary && attribute.real_name != "blob"
-          (obj[attribute.real_name] || []).each do |link|
+          (@obj[attribute.real_name] || []).each do |link|
             referenced << link.destination_object
+            Rails.logger.debug("referenced #{referenced}")
           end
         end
       end
+      referenced
     end
+
+    def check_binaries
+       binaries.each do |binary|
+         unrelease_unused(binary)
+       end
+    end
+
   end
 end

data/lib/fiona7/scrivito_patches/binary.rb

@@ -271,7 +271,13 @@ module Fiona7
         meta_binary    = MetaBinary.new(binary_id, transformation)
 
         if !meta_binary.present?
-          not_found
+          if Fiona7.mode == :standalone &&
+             (current_binary = get_current_binary_url(binary_id))
+            Rails.logger.info("Redirect to #{current_binary}")
+            redirect_to current_binary, status: 301
+          else
+            not_found
+          end
         elsif !meta_binary.valid?
           bad_request
         elsif stale?(:last_modified => meta_binary.last_changed) && true
@@ -317,6 +323,18 @@ module Fiona7
       def head_ok
         head 200
       end
+
+      def get_current_binary_url(binary_id)
+        current_binary_url = nil
+        blob_obj = Fiona7::WriteObj.find(binary_id.to_i) rescue nil
+        if blob_obj
+          binary_obj = blob_obj.parent.parent rescue nil
+          if binary_obj
+            current_binary_url = Obj.find(binary_obj.obj_id).blob.url rescue nil
+          end
+        end
+        current_binary_url
+      end
     end
 
 

data/lib/fiona7/scrivito_patches/page_config.rb

@@ -10,7 +10,7 @@ module Scrivito
         path: obj.path,
         obj_class: obj.obj_class,
         description_for_editor: obj.description_for_editor,
-        has_children: obj.children.any?,
+        has_children: obj.children.reject(&:binary?).any?,
         has_conflict: obj.has_conflict?,
         has_details_view: obj_has_details_view?,
         modification: modification(obj),

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.6.1.1.1"
+  VERSION = "1.6.1.1.5"
 end

data/lib/fiona7/widget_gc/sweep_strategies/revert_sweep.rb

@@ -25,6 +25,7 @@ module Fiona7
         protected
         attr_accessor :object, :widget_resolver
         def revert!(widget_object)
+          widget_object.take! if widget_object.really_edited?
           widget_object.revert! if widget_object.really_edited?
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.6.1.1.1
+  version: 1.6.1.1.5
 platform: ruby
 authors:
-- Tomasz Przedmojski
+- Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.26.1
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +122,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: scrivito-compatible interface for classic Fiona
+description: scrivito-compatible interface for Infopark CMS Fiona 7
 email:
-- tomasz.przedmojski@infopark.de
+- support@infopark.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -238,6 +238,7 @@ files:
 - lib/fiona7/attribute_writers/simple.rb
 - lib/fiona7/attribute_writers/stringlist_as_text.rb
 - lib/fiona7/attribute_writers/widgetlist_as_linklist.rb
+- lib/fiona7/binary_files_cleaner.rb
 - lib/fiona7/blob_id_generator.rb
 - lib/fiona7/builder/batch_widget_writer.rb
 - lib/fiona7/builder/container_chain_builder.rb
@@ -365,8 +366,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: scrivito-compatible interface for classic Fiona
+summary: scrivito-compatible interface for Infopark CMS Fiona 7
 test_files: []