infopark_fiona7 1.5.5.5.1 → 1.6.1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 177ce65e32ed0f678d47597707dac7ba6c92fe38
-  data.tar.gz: 76004b87e5ef7a1ebb67a70b9f237569ac19ec39
+  metadata.gz: cd5af32d592de98bf21bad9ae13300a9c5a17786
+  data.tar.gz: 45b0946e073a24b93b2b418770c8de7eee312889
 SHA512:
-  metadata.gz: 92e28bf2c4f333be21b7e7fcc4b95bbea8848b273ff46fdd3059cf3f1c174cf1cd67f9e7ac2ac1dfae2637e7bb6b129127b2d2995de34ea0e2577351d0c5cc58
-  data.tar.gz: d4ab26477bc1c9e1b4e6f0a4dc3ae292ed861a65bffdd4bb0b30f12afd7e2228a4bc60442f5b237fe95c8b171c20fe02cf1e59b4a4addf5b254774ab2609f46a
+  metadata.gz: 1e33280b118ab2e9b6b023450be624fc0f223f8e894195493aa6aa342d7ab937e23b58bf8dd0d0910bc8e4cd4a4e17951d894c1d39b27b4fa45492c12fe29af3
+  data.tar.gz: 26841cfc7effbc06117518a6e2e1585ae44dbaf5534749015c3e8bcdf76ca7a9e07b87534ded47391e96caef0cdfbb13467bcd15bd63d659e54bcc7f263f04a4

data/Rakefile

@@ -30,6 +30,14 @@ namespace "package" do
           f.write Babel::Transpiler.transform(File.read(fname))["code"]
         end
       end
+
+      if /\.js\.jsx$/ =~ fname
+        nfname = ::File.join(::File.dirname(fname), ::File.basename(fname, '.js.jsx') + '.js')
+        puts "#{fname} -> #{nfname}"
+        ::File.open(nfname, 'w') do |f|
+          f.write Babel::Transpiler.transform(File.read(fname))["code"]
+        end
+      end
     end
     puts "Processing handlebars templates"
     templates = []
@@ -71,6 +79,11 @@ namespace "clean" do
         puts "#{nfname}"
         ::FileUtils.rm(nfname) if ::File.exists?(nfname)
       end
+      if /\.js\.jsx$/ =~ fname
+        nfname = ::File.join(::File.dirname(fname), ::File.basename(fname, '.js.jsx') + '.js')
+        puts "#{nfname}"
+        ::FileUtils.rm(nfname) if ::File.exists?(nfname)
+      end
     end
   end
 end
@@ -81,3 +94,7 @@ end
 
 Bundler::GemHelper.install_tasks
 
+
+task "build" => ["clean:js"] do
+  # dummy, needed to clean-up
+end

data/app/assets/javascripts/fiona7/task_list_dialog.js

@@ -41,7 +41,7 @@
 
       _.each(tasks, function(task) {
         task.obj_data = task.obj;
-        task.obj = scrivito.obj.create_instance(task.obj);
+        task.obj = scrivito.legacy_obj.create_instance(task.obj);
         task.last_changed = string_date_to_function(task.last_changed);
       });
 
@@ -51,7 +51,7 @@
 
   var string_date_to_function = function(string_date) {
     return function() {
-      return scrivito.parseDate(string_date);
+      return scrivito.types.deserializeAsDate(string_date);
     };
   };
 

data/app/assets/javascripts/fiona7/templates.js

@@ -73,7 +73,7 @@
     + "\n    </span>\n  </td>\n\n  <td>\n    <span>\n      <time datetime=\""
     + container.escapeExpression(((helper = (helper = helpers.last_changed || (depth0 != null ? depth0.last_changed : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"last_changed","hash":{},"data":data}) : helper)))
     + "\" title=\""
-    + container.escapeExpression((helpers.localize_date || (depth0 && depth0.localize_date) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.last_changed : depth0),{"name":"localize_date","hash":{},"data":data}))
+    + container.escapeExpression((helpers.localizeDate || (depth0 && depth0.localizeDate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.last_changed : depth0),{"name":"localizeDate","hash":{},"data":data}))
     + "\">\n        "
     + container.escapeExpression((helpers.localizeDateRelative || (depth0 && depth0.localizeDateRelative) || helpers.helperMissing).call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.last_changed : depth0),{"name":"localizeDateRelative","hash":{},"data":data}))
     + "\n      </time>\n    </span>\n  </td>\n</tr>\n";
@@ -89,18 +89,3 @@
 },"useData":true});
               return this.ScrivitoHandlebarsTemplates["task_list_dialog"];
             }).call(this);
-            (function() {
-              this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
-              this.ScrivitoHandlebarsTemplates["task_list_menu_item"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper;
-
-  return "<li id=\"fiona7_task_list\" class=\"scrivito_menu_item fiona7_task_list\">\n<span title=\""
-    + container.escapeExpression(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"title","hash":{},"data":data}) : helper)))
-    + "\"><i class=\"scrivito_icon\">"
-    + ((stack1 = ((helper = (helper = helpers.icon || (depth0 != null ? depth0.icon : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"icon","hash":{},"data":data}) : helper))) != null ? stack1 : "")
-    + "</i> "
-    + container.escapeExpression(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"title","hash":{},"data":data}) : helper)))
-    + " </span>\n</li>\n";
-},"useData":true});
-              return this.ScrivitoHandlebarsTemplates["task_list_menu_item"];
-            }).call(this);

data/app/assets/javascripts/fiona7/translations.js

@@ -1,5 +1,5 @@
 (function() {
-  $.i18n().load({
+  scrivito.i18n.load('de', {
     'commands.release_obj.title': 'Seite freigeben',
     'commands.release_obj.not_modified_obj': 'Diese Seite wurde nicht geändert. Daher gibt es nichts zu freigeben.',
     'commands.release_obj.dialog.title': 'Änderungen an dieser Seite veröffentlichen?',
@@ -51,10 +51,22 @@
     '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');
+    'editing_disabled.permissions': 'Ihnen fehlen die Rechte um die Datei zu bearbeiten',
+    'commands.task_list.title': 'Aufgaben anzeigen',
+    'task_list_dialog.title.all': 'Aufgaben anzeigen: alle Aufgaben',
+    'task_list_dialog.title.user': 'Aufgaben anzeigen: meine Aufgaben',
+    'task_list_dialog.mode_toggle.all': 'Meine Aufgaben anzeigen',
+    'task_list_dialog.mode_toggle.user': 'Alle Aufgaben anzeigen',
+    'task_list_dialog.user_login': 'Benutzer',
+    'task_list_dialog.group_name': 'Gruppe',
+    'task_list_dialog.comment': 'Kommentar',
+    'task_list_dialog.empty': 'Keine Aufgaben',
+    'sidebar.workspaces_panel.tasks_button.title': 'Aufgaben',
+    'sidebar.workspaces_panel.tasks_button.hint': 'Aufgabendialog anzeigen',
+    'sidebar.workspaces_panel.tasks_button.is_forbidden': 'Aufgaben können aufgrund fehlender Benutzerrechte nicht angezeigt werden.',
+  });
 
-  $.i18n().load({
+  scrivito.i18n.load('en', {
     'commands.release_obj.title': 'Release page',
     'commands.release_obj.not_modified_obj': 'This resource has not been modified. Therefore, nothing can be released.',
     'commands.release_obj.dialog.title': 'Release this page?',
@@ -106,22 +118,7 @@
     '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');
-
-  $.i18n().load({
-    'commands.task_list.title': 'Aufgaben anzeigen',
-    'task_list_dialog.title.all': 'Aufgaben anzeigen: alle Aufgaben',
-    'task_list_dialog.title.user': 'Aufgaben anzeigen: meine Aufgaben',
-    'task_list_dialog.mode_toggle.all': 'Meine Aufgaben anzeigen',
-    'task_list_dialog.mode_toggle.user': 'Alle Aufgaben anzeigen',
-    'task_list_dialog.user_login': 'Benutzer',
-    'task_list_dialog.group_name': 'Gruppe',
-    'task_list_dialog.comment': 'Kommentar',
-    'task_list_dialog.empty': 'Keine Aufgaben'
-  }, 'de');
-
-  $.i18n().load({
+    'editing_disabled.permissions': 'You do not have the permissions required to edit this page.',
     'commands.task_list.title': 'Task list',
     'task_list_dialog.title.all': 'Task list: All tasks',
     'task_list_dialog.title.user': 'Task list: My tasks',
@@ -130,7 +127,9 @@
     'task_list_dialog.user_login': 'User',
     'task_list_dialog.group_name': 'Receiving group',
     'task_list_dialog.comment': 'Comment',
-    'task_list_dialog.empty': 'No taks'
-  }, 'en');
-
+    'task_list_dialog.empty': 'No tasks',
+    'sidebar.workspaces_panel.tasks_button.title': 'Tasks',
+    'sidebar.workspaces_panel.tasks_button.hint': 'Open the tasks dialog',
+    'sidebar.workspaces_panel.tasks_button.is_forbidden': 'You cannot open the tasks dialog due to missing user permissions.',
+  });
 }());

data/app/assets/javascripts/fiona7_ui.js

@@ -1,18 +1,7 @@
-//= require scrivito_patches/models/api/basic_obj
-//= require scrivito_patches/models/binary_field_element
-//= require scrivito_patches/models/obj
-//= require scrivito_patches/ajax
-//= require scrivito_patches/attribute_serializer
-//= require scrivito_patches/ajax_error_handling
-//= require scrivito_patches/base_obj_path
-//= require scrivito_patches/cms_rest_api
-//= require scrivito_patches/obj_serializer
-//= require scrivito_patches/binary_utils
+//= require_tree ./scrivito_patches
 //= require fiona7/translations
 //= require fiona7/templates
 //= require fiona7/task_list_dialog
-//= require fiona7/task_list_command
-//= require fiona7/task_list_menu_item
 //= require_self
 
 (function() {
@@ -21,27 +10,9 @@
   var $ = window.$;
 
   scrivito.gui.on('open', function() {
-    scrivito.task_list_menu_item.init();
+    //scrivito.task_list_menu_item.init();
   });
 
-  var original_create_instance = scrivito.child_list_element.create_instance;
-
-  /* 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;
-  };
-
   var open_confirmation_dialog = function(action,icon) {
     return scrivito.prompt_dialog({
       title: scrivito.t('commands.'+action+'_obj.dialog.title'),
@@ -133,28 +104,48 @@
   };
   var actions = ["edit", "forward", "reject","commit", "sign", "take"];
 
-  var releaseAction = function (objId) {
+  var reloadWholePage = function () {
+    return scrivito.withSavingOverlay(scrivito.reload());
+  };
+
+  var pageActionComplete = function (action) {
+    if (action == 'edit' || action == 'take') {
+      return function () {
+        if (!scrivito.editingContext.isEditingMode()) {
+          return scrivito.withSavingOverlay(
+            scrivito.changeEditingContext({display_mode: 'editing', workspace_id: 'rtc'}));
+        } else {
+          return reloadWholePage();
+        }
+      };
+    } else {
+      // NOTE: no call here, just function returned
+      return reloadWholePage;
+    }
+  };
+
+  var reloadGivenWindow = function(targetWindow) {
+    return function () {
+      if (targetWindow && targetWindow.location) {
+        // forgo cache
+        targetWindow.location.reload(true);
+      }
+    };
+  };
+
+  var releaseAction = function (objId, reloadFunction) {
+    reloadFunction = reloadFunction || reloadWholePage;
+
     open_release_dialog(objId).done(function(objIds, comment) {
-      scrivito.withSavingOverlay(scrivito.ajax('PUT', 'objs/release', {data: {objs: objIds, comment: comment}}).then(function() {
-        scrivito.reload();
-      }));
+      scrivito.withSavingOverlay(scrivito.ajax('PUT', 'objs/release', {data: {objs: objIds, comment: comment}}).then(reloadFunction));
     });
   };
 
-  var workflowAction = function (action, objId) {
+  var workflowAction = function (action, objId, reloadFunction) {
+    reloadFunction = reloadFunction || pageActionComplete(action);
+
     open_confirmation_dialog(action, dialog_icons[action]).done(function(comment) {
-      scrivito.withSavingOverlay(scrivito.ajax('PUT', 'objs/workflow/'+action, {data: {id: objId, comment: comment}}).then(function() {
-        if (action == 'edit' || action == 'take') {
-          if (!scrivito.editing_context.is_editing_mode()) {
-            return scrivito.withSavingOverlay(
-              scrivito.change_editing_context({display_mode: 'editing', workspace_id: 'rtc'}));
-          } else {
-            return scrivito.withSavingOverlay(scrivito.reload());
-          }
-        } else {
-          return  scrivito.withSavingOverlay(scrivito.reload());
-        }
-      }));
+      scrivito.withSavingOverlay(scrivito.ajax('PUT', 'objs/workflow/'+action, {data: {id: objId, comment: comment}}).then(reloadFunction));
     });
   };
 
@@ -164,8 +155,9 @@
     var buttons          = page_config['buttons'] || [];
     var workflow_enabled = page_config['workflow'];
 
+    var source_frame     = cms_document.browser_window();
 
-    if (cms_document.browser_window().name !== 'scrivito_application') {
+    if (source_frame.name !== 'scrivito_application') {
       // TODO: add special handling for scrivito_details_dialog and scrivito_inspector
       var button;
 
@@ -183,7 +175,7 @@
         button.removeAttr('disabled');
         button.removeClass('disabled');
         button.click(function () {
-          workflowAction(action, obj.id());
+          workflowAction(action, obj.id(), reloadGivenWindow(source_frame));
         });
 
       });
@@ -206,7 +198,7 @@
           button.removeAttr('disabled');
           button.removeClass('disabled');
           button.click(function () {
-            releaseAction(obj.id());
+            releaseAction(obj.id(), reloadGivenWindow(source_frame));
           });
         }
       }
@@ -220,13 +212,10 @@
       icon: icons['release'],
 
       present: function() {
-        return scrivito.editing_context.selected_workspace.is_editable() && obj && (!workflow_enabled || (buttons.indexOf('release') !== -1));
+        return scrivito.editingContext.selectedWorkspace.is_editable() && obj && (!workflow_enabled || (buttons.indexOf('release') !== -1));
       },
 
       disabled: function() {
-        if (!obj.modification()) {
-          return scrivito.t('commands.release_obj.not_modified_obj');
-        } 
         if (obj.has_restriction()) {
           return obj.restriction_messages().join("; ");
         }
@@ -237,7 +226,7 @@
       },
 
       execute: function() {
-        return releaseAction(obj.id());
+        return releaseAction(obj.id(), pageActionComplete('release'));
       }
     });
     /* TODO: enforce permissions */
@@ -247,9 +236,17 @@
     /* disable editing */
     setTimeout(function (){
       if (page_config['editing_disabled']) {
-        scrivito.editing_mode.disable(scrivito.t('editing_disabled.workflow'));
+        scrivito.editingMode.disable(scrivito.t('editing_disabled.workflow'));
       } else {
-        scrivito.editing_mode.enable();
+        if (!scrivito.editingMode.isEnabled()) {
+          if (scrivito.editingContext.selectedWorkspace.is_editable()) {
+            scrivito.editingMode.enable(function (){
+              scrivito.changeEditingContext({display_mode: 'editing', workspace_id: 'rtc'});
+            });
+          } else {
+            scrivito.editingMode.enable();
+          }
+        }
       }
     }, 0);
 
@@ -264,7 +261,7 @@
         },
 
         execute: function() {
-          return workflowAction(action, obj.id());
+          return workflowAction(action, obj.id(), pageActionComplete(action));
         }
       });
     });

data/app/assets/javascripts/scrivito_patches/base_obj_path.js

@@ -1,10 +1,12 @@
-(function() {
+"use strict";
+
+(function () {
   _.extend(scrivito, {
-    path_for_id: function(id) {
-      return '/__scrivito/' + id;
+    path_for_id: function path_for_id(id) {
+      return "/__scrivito/" + id;
     },
 
-    id_from_path: function(url) {
+    id_from_path: function id_from_path(url) {
       // -- PATCH BEGINS HERE --
       var match = /__scrivito\/([a-z0-9]{4,})/.exec(url);
       // -- PATHC ENDS HERE --
@@ -12,6 +14,10 @@
       if (match) {
         return match[1];
       }
+    },
+
+    detailsPathForId: function detailsPathForId(objId) {
+      return "/__scrivito/page_details/" + objId;
     }
   });
-})();
+})();

data/app/assets/javascripts/scrivito_patches/binary_request.js

@@ -0,0 +1,53 @@
+'use strict';
+
+(function () {
+  scrivito.BinaryRequest = {
+    // COMPLETELY NEW IMPLEMENTATION HERE
+    upload: function upload(objId, blob, filename, contentType) {
+      scrivito.write_monitor.start_write();
+      return uploadToBackend(objId, blob, filename, contentType)['finally'](scrivito.write_monitor.end_write);
+    },
+
+    copy: function copy(copyId, objId, filename, contentType) {
+      var encodedCopyId = encodeURIComponent(copyId);
+      var params = {};
+
+      if (filename) {
+        params.filename = filename;
+      }
+
+      if (contentType) {
+        params.content_type = contentType;
+      }
+
+      params.destination_obj_id = objId;
+
+      return scrivito.CmsRestApi.put('blobs/' + encodedCopyId + '/copy', params);
+    },
+
+    // For test purpose only.
+    getFormData: function getFormData() {
+      return new FormData();
+    }
+  };
+
+  function uploadToBackend(objId, blob, filename, contentType) {
+    var formData = scrivito.BinaryRequest.getFormData();
+    formData.append('obj_id', objId);
+    formData.append('filename', filename);
+    formData.append('content_type', contentType);
+    formData.append('file', blob);
+
+    return scrivito.Promise.resolve($.ajax({
+      method: 'POST',
+      url: '/_f7/uploads/temp',
+      data: formData,
+      // These are needed in order for jQuery to work properly with a FormData.
+      contentType: false,
+      processData: false,
+      xhrFields: { withCredentials: true }
+    })).then(function (blob_data) {
+      return blob_data;
+    });
+  };
+})();

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

@@ -0,0 +1,122 @@
+'use strict';
+
+(function () {
+  _.extend(scrivito, {
+    ajax: function ajax(type, path) {
+      var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+
+      var isWriteRequest = type === 'PUT' || type === 'POST' || type === 'DELETE';
+      var skipWriteMonitor = options && options.skip_write_monitor;
+
+      if (isWriteRequest) {
+        options.timeout = 15000; // miliseconds
+
+        if (!skipWriteMonitor) {
+          scrivito.write_monitor.start_write();
+        }
+      }
+
+      var ajaxPromise = singleAjax(type, path, options).then(function (result) {
+        if (result && result.task && _.size(result) === 1) {
+          return handleTask(result.task);
+        }
+
+        return $.Deferred().resolve(result);
+      });
+
+      if (isWriteRequest && !skipWriteMonitor) {
+        ajaxPromise.always(function () {
+          scrivito.write_monitor.end_write();
+        });
+      }
+
+      return ajaxPromise;
+    },
+
+    ajaxWithErrorDialog: function ajaxWithErrorDialog(type, path, options) {
+      return scrivito.ajax(type, path, options).fail(function (error) {
+        scrivito.displayAjaxError(error);
+      });
+    },
+
+    displayAjaxError: function displayAjaxError(error) {
+      /*
+      let message;
+      let messageForEditor;
+       if (_.isObject(error)) {
+        message = scrivito.t('ajax_error', error.message);
+        messageForEditor = error.message_for_editor;
+      } else if (_.contains(['abort', 'parsererror', 'timeout'], error)) {
+        message = scrivito.t('ajax_error.communication');
+      } else {
+        message = scrivito.t('ajax_error', error);
+      }
+       if (scrivito.isDevelopmentMode) {
+        scrivito.alertDialog(message);
+      } else {
+        scrivito.logError(message);
+        scrivito.errorDialog(messageForEditor || scrivito.t('ajax_error.message_for_editor'),
+          [error.timestamp, message]);
+      }
+      */
+      // -- PATCH BEGINS HERE --
+      var message, message_for_editor;
+
+      if (_.isObject(error)) {
+        if (error.message) {
+          return scrivito.alertDialog(error.message);
+        } else {
+          return scrivito.alertDialog(scrivito.t('ajax_error.communication'));
+        }
+      } else if (_.contains(['abort', 'parsererror', 'timeout'], error)) {
+        message = scrivito.t('ajax_error.communication');
+      } else {
+        message = scrivito.t('ajax_error', error);
+      }
+      scrivito.logError(message);
+      scrivito.errorDialog(message_for_editor || scrivito.t('ajax_error.message_for_editor'), [error.timestamp, message]);
+      // -- PATCH ENDS HERE --
+    }
+  });
+
+  function handleTask(task) {
+    switch (task.status) {
+      case 'success':
+        return $.Deferred().resolve(task.result);
+      case 'error':
+        return $.Deferred().reject({
+          message: task.message,
+          code: task.code
+        });
+      case 'open':
+        return scrivito.wait(2).then(function () {
+          return singleAjax('GET', 'tasks/' + task.id);
+        }).then(handleTask);
+      default:
+        throw { message: 'Invalid task (unknown status)', task: task };
+    }
+  }
+
+  function singleAjax(type, path, options) {
+    var baseUrl = window.location.protocol + '//' + window.location.host + '/__scrivito/';
+    if (options && options.data) {
+      options.data = JSON.stringify(options.data);
+    }
+    var ajaxRequest = $.ajax(baseUrl + path, _.extend({
+      type: type,
+      dataType: 'json',
+      contentType: 'application/json; charset=utf-8',
+      cache: false }, // Don't cache GET requests.
+    options || {}));
+
+    return ajaxRequest.then(function (result) {
+      return $.Deferred().resolve(result);
+    }, function (xhr, _textStatus, xhrError) {
+      try {
+        return $.Deferred().reject(JSON.parse(xhr.responseText));
+      } catch (SyntaxError) {
+        return $.Deferred().reject(xhrError);
+      }
+    });
+  }
+})();