infopark_fiona7 1.1.0.0.10 → 1.2.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f157ab2c9327bc25c25a102610afd55d62cd58a1
-  data.tar.gz: e72a68bf50020c0ff5601cafe79abb25ed78914f
+  metadata.gz: 5390d8274e0e6c0929da925705786a07b297d912
+  data.tar.gz: 13969d1b7aa62d32be9679bd08b576bae5cb471a
 SHA512:
-  metadata.gz: 039eb2f418d793ad1cf654a0dfcde66401b84ecdf9c6ac7a4173c774c3399cb228be72dbb2dc1b34f16de7821e2cb8c68c76c8626f3e8a54037b0ac3a3fe5865
-  data.tar.gz: ac03a8ce8184097ec663ad18e6710cb8a4e002641c0b78be89e5fb4b9acc8fd9284acf219ff1f1eb2b9cc17b4e7aa1f156a0e12f68e83dfcc5b85e5b8ce41cf2
+  metadata.gz: a752b07549ac28002aede720ea199a2d299898e5d6e325365dabee926cca3a58d5a67f2352fcfc367fe19876b154bc9b4ed0add07c2b5e372300a3d8aa1f02b9
+  data.tar.gz: 6aa69f7e831a3d9fdc9fecb5028bbfbf3b935a29655895f5fa24aed5d8a67b70fed900bdbf2e40246a0ec33f96de671c7034921cd2f6ec03ae09471a56c3f67b

data/app/assets/javascripts/fiona7_ui.js

@@ -104,6 +104,13 @@
     'commands.release_obj.dialog.confirm': 'Freigeben',
     'commands.release_obj.failed': 'Freigabe fehlgeschlagen',
 
+    'commands.edit_obj.title': 'Seite bearbeiten',
+    'commands.edit_obj.dialog.title': 'Seite bearbeiten?',
+    'commands.edit_obj.dialog.description': 'Es wird eine neue Arbeitsversion erstellt.',
+    'commands.edit_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
+    'commands.edit_obj.dialog.confirm': 'Bearbeiten',
+    'commands.edit_obj.failed': 'Bearbeitung fehlgeschlagen',
+
     'commands.forward_obj.title': 'Seite weiterleiten',
     'commands.forward_obj.dialog.title': 'Seite weiterleiten?',
     'commands.forward_obj.dialog.description': 'Die Arbeitsversion wird an einen weiteren Bearbeiter weitergeleitet. Dieser Vorgang kann nicht rückgängig gemacht werden.',
@@ -137,7 +144,10 @@
     'commands.take_obj.dialog.description': 'Die Arbeitsversion wird übernommen. Dieser Vorgang kann nicht rückgängig gemacht werden.',
     'commands.take_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
     'commands.take_obj.dialog.confirm': 'Übernehmen',
-    'commands.take_obj.failed': 'Übernahme fehlgeschlagen'
+    'commands.take_obj.failed': 'Übernahme fehlgeschlagen',
+
+    'editing_disabled.workflow': 'Die Datei unterliegt einem Workflow und kann nicht direkt bearbeitet werden.',
+    'editing_disabled.permissions': 'Ihnen fehlen die Rechte um die Datei zu bearbeiten'
   }, 'de');
 
   $.i18n().load({
@@ -149,6 +159,13 @@
     'commands.release_obj.dialog.confirm': 'Release',
     'commands.release_obj.failed': 'Release failed',
 
+    'commands.edit_obj.title': 'Edit page',
+    'commands.edit_obj.dialog.title': 'Edit this page?',
+    'commands.edit_obj.dialog.description': 'A new version of this page will be created.',
+    'commands.edit_obj.dialog.placeholder': 'Comment',
+    'commands.edit_obj.dialog.confirm': 'Edit',
+    'commands.edit_obj.failed': 'Edit failed',
+
     'commands.forward_obj.title': 'Forward page',
     'commands.forward_obj.dialog.title': 'Forward this page?',
     'commands.forward_obj.dialog.description': 'Forward and edited page is final. This operation cannot be reverted.',
@@ -158,14 +175,14 @@
 
     'commands.reject_obj.title': 'Reject page',
     'commands.reject_obj.dialog.title': 'Reject this page?',
-    'commands.reject_obj.dialog.description': 'Die Arbeitsversion wird abgelehnt. Dieser Vorgang kann nicht rückgängig gemacht werden.',
+    'commands.reject_obj.dialog.description': 'Current page will be rejected. This operation cannot be reverted.',
     'commands.reject_obj.dialog.placeholder': 'Comment',
     'commands.reject_obj.dialog.confirm': 'Reject',
     'commands.reject_obj.failed': 'Reject failed',
 
     'commands.sign_obj.title': 'Sign page',
     'commands.sign_obj.dialog.title': 'Sign this page?',
-    'commands.sign_obj.dialog.description': 'Die eingereichte Version wird abgezeichnet. Dieser Vorgang kann nicht rückgängig gemacht werden.',
+    'commands.sign_obj.dialog.description': 'Committed page will be signed. This operation cannot be reverted.',
     'commands.sign_obj.dialog.placeholder': 'Comment',
     'commands.sign_obj.dialog.confirm': 'Sign',
     'commands.sign_obj.failed': 'Signing failed',
@@ -182,19 +199,24 @@
     'commands.take_obj.dialog.description': 'Die Arbeitsversion wird übernommen. Dieser Vorgang kann nicht rückgängig gemacht werden.',
     'commands.take_obj.dialog.placeholder': 'Comment',
     'commands.take_obj.dialog.confirm': 'Take',
-    'commands.take_obj.failed': 'Take failed'
+    'commands.take_obj.failed': 'Take failed',
+
+    'editing_disabled.workflow': 'The current page belongs to a workflow and cannot be edited directly.',
+    'editing_disabled.permissions': 'You do not have the permissions required to edit this page.'
   }, 'en');
 
   var dialog_icons = {
+    "edit": "",
     "forward": "",
     "reject": "",
-    "commit": "&#xcheck;",
+    "commit": "",
     "sign": "",
     "take": "",
     "release": ""
   };
 
   var icons = {
+    "edit": "pen",
     "forward": "check",
     "reject": "cross",
     "commit": "check",
@@ -202,69 +224,93 @@
     "take": "exclamation",
     "release": "globe"
   };
-  var actions = ["forward", "reject","commit", "sign", "take", "release"];
-  actions = ["release"];
+  var actions = ["edit", "forward", "reject","commit", "sign", "take"];
 
   scrivito.gui.on('document', function(cms_document) {
-    //console.log('adding release button');
-    var obj = cms_document.page();
+    var page_config      = (cms_document.page_config() || {})['current_page'] || {};
+    var obj              = cms_document.page();
+    var buttons          = page_config['buttons'] || [];
+    var workflow_enabled = page_config['workflow'];
+
+    if (cms_document.browser_window().name !== 'scrivito_application') {
+      // TODO: add special handling for scrivito_details_dialog and scrivito_inspector
+      return;
+    }
+
+    /* release button */
+    scrivito.page_menu(cms_document).add('fiona7.idx'+99+'.release_obj', {
+      title:  scrivito.t('commands.release_obj.title'),
+      icon: icons['release'],
+
+      present: function() {
+        return scrivito.editing_context.selected_workspace.is_editable() && obj && (!workflow_enabled || (buttons.indexOf('release') !== -1));
+      },
 
-    _.each(actions, function(action,idx) {
+      disabled: function() {
+        if (!obj.modification()) {
+          return scrivito.t('commands.release_obj.not_modified_obj');
+        } 
+        if (obj.has_restriction()) {
+          return obj.restriction_messages().join("; ");
+        }
+      },
+
+      update: function() {
+        return obj.reload();
+      },
+
+      execute: function() {
+        open_release_dialog(obj.id()).done(function(objIds, comment) {
+          scrivito.with_saving_overlay(scrivito.ajax('PUT', 'objs/release', {data: {objs: objIds, comment: comment}}).then(function() {
+            scrivito.reload();
+          }));
+        });
+      }
+    });
+    /* TODO: enforce permissions */
+
+    /* TODO: better sorting */
+
+    /* disable editing */
+    setTimeout(function (){
+      if (page_config['editing_disabled']) {
+        scrivito.editing_mode.disable(scrivito.t('editing_disabled.workflow'));
+      } else {
+        scrivito.editing_mode.enable();
+      }
+    }, 0);
+
+    /* add workflow buttons */
+    $.each(actions, function(idx, action) {
       scrivito.page_menu(cms_document).add('fiona7.idx'+idx+'.'+action+'_obj', {
         title:  scrivito.t('commands.'+action+'_obj.title'),
         icon: icons[action],
 
         present: function() {
-          return scrivito.editing_context.selected_workspace.is_editable() && obj;// && !obj.is_deleted() && scrivito.user_permissions.can(action + '_obj');
-        },
-
-        disabled: function() {
-          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() {
-          return obj.reload();
+          return buttons.indexOf(action) !== -1;
         },
 
         execute: function() {
-          open_release_dialog(obj.id()).done(function(objIds, comment) {
-            scrivito.with_saving_overlay(scrivito.ajax('PUT', 'objs/release', {data: {objs: objIds, comment: comment}}).then(function() {
-              scrivito.reload();
+          open_confirmation_dialog(action, dialog_icons[action]).done(function(comment) {
+            scrivito.with_saving_overlay(scrivito.ajax('PUT', 'objs/workflow/'+action, {data: {id: obj.id(), comment: comment}}).then(function() {
+              if (action == 'edit' || action == 'take') {
+
+                if (!scrivito.editing_context.is_editing_mode()) {
+                  return scrivito.with_saving_overlay(
+                    scrivito.change_editing_context({display_mode: 'editing', workspace_id: 'rtc'}));
+                } else {
+                  return scrivito.with_saving_overlay(scrivito.reload());
+                }
+              } else {
+                return  scrivito.with_saving_overlay(scrivito.reload());
+              }
             }));
           });
         }
       });
     });
 
-
-    //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.*', '*']);
   });
 
   return;
-
-  /* enforce permissions */
-  var originalGuiStart = scrivito.gui.start;
-  scrivito.gui.start = function () {
-    originalGuiStart.call(this, arguments);
-    if (scrivito.in_editable_view()) {
-      if (!scrivito.user_permissions.can('write_obj')) {
-        $('.switch_to_view_mode').click();
-      }
-    } else {
-      if (!scrivito.user_permissions.can('write_obj')) {
-        $('.scrivito_viewmode_editing').remove();
-      }
-    }
-  };
-
 }());

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

@@ -22,8 +22,29 @@
         params.filename = params.filename.replace(/[^\w\-_\.$]/g, '-');
 
         return $.extend(params, {is_uploaded_binary: true});
+      },
+
+      copy_binary: function(id, obj_id, attr_name, params) {
+        assert_valid_params(params);
+
+        return _.extend({
+          is_copied_binary: true,
+          id_to_copy: id,
+          obj_id: obj_id,
+          attr_name: attr_name
+        }, params);
       }
     }
   });
 
+
+  var assert_valid_params = function(params) {
+    if (_.has(params, 'filename') && !params.filename) {
+      $.error('filename cannot be blank');
+    }
+
+    if (_.has(params, 'content_type') && !params.content_type) {
+      $.error('content_type cannot be blank');
+    }
+  };
 }());

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

@@ -201,7 +201,7 @@
           var current_page = scrivito.application_document().page();
           var path = (typeof current_page.provided_path === 'function') && current_page.provided_path();
           params = {};
-          params['_path'] = path;
+          params['parent_path'] = path;
         }
         return scrivito.obj.fetch_class_selection('objs/page_class_selection', params);
       },

data/app/controllers/fiona7/release_controller.rb

@@ -46,8 +46,12 @@ module Fiona7
     end
 
     def carefully_release(errors, obj, comment=nil)
-      obj.take
-      obj.release!(comment) if obj.really_edited?
+      if obj.really_edited?
+        # we don't care much if this fails
+        obj.take
+        obj.release!(comment) 
+        ::Fiona7.run_callbacks(:release_obj, obj.id)
+      end
 
       complex_object = Fiona7::ComplexObject.new(obj)
       complex_object.widgets.each do |widget_obj|

data/app/controllers/fiona7/sessions_controller.rb

@@ -42,6 +42,9 @@ module Fiona7
       Reactor::Sudo.su(Fiona7.root) do
         Reactor::Cm::User.new(login).has_password?(password)
       end
+    rescue Reactor::Cm::XmlRequestError => e
+      Rails.logger.error("Error logging in: #{e.message}")
+      false
     end
   end
 end

data/app/controllers/fiona7/workflow_controller.rb

@@ -0,0 +1,46 @@
+module Fiona7
+  class WorkflowController < ActionController::Base
+    def edit
+      workflow_action('edit')
+    end
+
+    def take
+      workflow_action('take')
+    end
+
+    def forward
+      workflow_action('forward')
+    end
+
+    def commit
+      workflow_action('commit')
+    end
+
+    def sign
+      workflow_action('sign')
+    end
+
+    def reject
+      workflow_action('reject')
+    end
+
+    protected
+    def workflow_action(action)
+      @obj     = WriteObj.find(params[:id])
+      @comment = params[:comment]
+
+      if action == 'edit'
+        # TODO: this should be implemented in reactor.
+        @obj.edit!(@comment)
+      else
+        @obj.workflow.send(:"#{action}!", @comment)
+      end
+
+      render json: {}
+    rescue => e
+      Rails.logger.error("Error #{e.inspect} when executing workflow operation on #{@obj.id} with comment=#{@comment}")
+      render json: {message: e.message, message_for_editor: e.message}, status: 412
+    end
+
+  end
+end

data/app/helpers/fiona7_login_helper.rb

@@ -1,4 +1,20 @@
 module Fiona7LoginHelper
+  def fiona7_login_path
+    fiona7_engine.fiona7_login_path
+  end
+
+  def fiona7_login_url
+    fiona7_engine.fiona7_login_url
+  end
+
+  def fiona7_logout_path
+    fiona7_engine.fiona7_logout_path
+  end
+
+  def fiona7_logout_url
+    fiona7_engine.fiona7_logout_url
+  end
+
   def fiona7_logged_in?
     rsession.user?
   end

data/app/helpers/fiona7_override_helper.rb

@@ -31,7 +31,7 @@ module Fiona7OverrideHelper
     raise "This method can only be used in legacy mode" unless Fiona7.mode == :legacy
 
     obj_or_widget = obj_or_widget.kind_of?(RailsConnector::BasicObj) ? obj_or_widget.scrivito_obj : obj_or_widget
-    scrivito_tag(tag_name, obj_or_widget, field_name, html_options, editing_options = {}, &block)
+    scrivito_tag(tag_name, obj_or_widget, field_name, html_options, editing_options, &block)
   end
   
   def fiona7_tag_list(tag_name, obj, field_name, options = {}, &block)

data/config/delayed_routes.rb

@@ -0,0 +1 @@
+Scrivito::PresetRoutes.install_delayed

data/config/precedence_routes.rb

@@ -0,0 +1,92 @@
+Rails.application.routes.draw do
+  mount Fiona7::Engine, at: '/', as: :fiona7_engine
+  mount Scrivito::SdkEngine, at: '/', as: :scrivito_engine
+end
+
+Fiona7::Engine.routes.draw do
+  get '/_b/:id(/:name)' => 'fiona7/blobs#show', as: :fiona7_blob
+
+  match '/_b/:id(/:name)' => 'fiona7/blobs#query', as: :fiona7_blob_meta, via: [:head]
+
+  post '/_f7/login', to: 'fiona7/sessions#create', as: :fiona7_login
+
+  delete '/_f7/logout', to: 'fiona7/sessions#destroy', as: :fiona7_logout
+
+  put '/__scrivito/objs/release(.:format)', to: 'fiona7/release#release', as: :fiona7_release
+
+  put '/__scrivito/objs/workflow/edit(.:format)', to: 'fiona7/workflow#edit', as: :fiona7_workflow_edit
+  put '/__scrivito/objs/workflow/take(.:format)', to: 'fiona7/workflow#take', as: :fiona7_workflow_take
+  put '/__scrivito/objs/workflow/forward(.:format)', to: 'fiona7/workflow#forward', as: :fiona7_workflow_forward
+  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/release/preview(.:format)', to: 'fiona7/release#preview', as: :fiona7_release_preview
+end
+
+Scrivito::SdkEngine.routes.draw do
+  get 'scrivito', to: 'scrivito/ui#index'
+  get 'scrivito/*application_path', to: 'scrivito/ui#index', format: false
+
+  scope '__scrivito', module: 'scrivito' do
+    get ':id', to: 'cms_dispatch#index', as: :base_id, constraints: {id: /\h{4,}/}
+
+    resources :objs, controller: 'objs', only: [:show, :create, :update, :destroy],
+        defaults: {format: :json} do
+      collection do
+        get :page_class_selection
+        get :search
+      end
+
+      member do
+        get :widget
+        get :widget_class_selection
+        get :widget_modification
+        get :conflicting_workspaces
+        get :is_outdated
+        get :binary_no_cache
+
+        post :copy
+        post :duplicate
+
+        put :revert
+        put :restore
+        put :mark_resolved
+        put :revert_widget
+        put :restore_widget
+        put :transfer_modifications
+      end
+    end
+
+    resources :tasks, controller: 'tasks', only: [:show], defaults: {format: :json}
+
+    get 'blobs/upload_permission' => 'blobs#upload_permission', defaults: {format: :json}
+    put 'blobs/activate_upload' => 'blobs#activate_upload', defaults: {format: :json}
+    put 'blobs/copy' => 'blobs#copy', defaults: {format: :json}
+
+    resources :workspaces,
+      controller: 'workspaces',
+      only: [:index, :show, :create, :destroy],
+      defaults: {format: :json} do
+        member do
+          put :rename
+          put :memberships
+          put :rebase
+          put :publish
+          get :check
+        end
+      end
+
+    get 'users/suggest' => 'users#suggest', defaults: {format: :json}
+    get 'suggest_completion' => 'completion#suggest', defaults: {format: :json}
+
+    get 'render_widget/:id/show_widget/:widget_id' => 'cms_dispatch#show_widget'
+    get 'render_widget/:id/widget_details/:widget_id' => 'cms_dispatch#widget_details'
+
+    get 'page_details/:id' => 'cms_dispatch#page_details'
+    get 'resource_details/:resource_id', to: 'ui#index'
+
+    get 'to_binary' => 'binary_redirect#to_binary', as: :binary
+  end
+end