infopark_fiona7 1.5.3.2.0 → 1.5.4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1d11c7ebae18abd2aee02f9699d5b9bcacc0560
-  data.tar.gz: 8c32fd876f686b96f5dbfc26735b28aafd393c2e
+  metadata.gz: 48f2e2270c1b9a56258e9a46ef13492dcd835805
+  data.tar.gz: f8c931d72b8a80bc2da52f3af652736e1e8494c6
 SHA512:
-  metadata.gz: 4f29a3c1804781c592e7f8816a3f65d56403fdb65df1da086e5204dcc42f2dc6c69f46a8701a04569546453b20730cdea2ebe03b05851a7d203e387141191681
-  data.tar.gz: d28cb1f6ce822dae0eb5f73b181e28c611397fd6dc75c4185025cadadaa1ee5d99a49360d1b0d3a490cef707bc583e3b5960eec5d03df049dae3e39a6c150f97
+  metadata.gz: 9e5ed06ef8ec90a08b28e7ef26dcede484ad4e6c7a8164ae4bd02d0062447b7af90ab54e5fa03a25f9766a0cb4b6286a068919d20114fe87244737cae2862f36
+  data.tar.gz: abc9e5a582f2c4aa46ebce452d923591fd462a4069c862f776cb3804131e3573c966ba9d36eeef4cc25da8dd5dc86bc4577defab72e3d3c0f9eac6f12fddf81b

data/Rakefile

@@ -18,8 +18,10 @@ end
 namespace "package" do
   desc "Package javascript"
   task "js" do
-    puts "Transpiling javascript files"
     require 'babel/transpiler'
+    require 'handlebars_assets'
+
+    puts "Transpiling javascript files"
     Dir["app/**/*"].each do |fname|
       if /\.es6\.js$/ =~ fname
         nfname = ::File.join(::File.dirname(fname), ::File.basename(fname, '.es6.js') + '.js')
@@ -29,6 +31,33 @@ namespace "package" do
         end
       end
     end
+    puts "Processing handlebars templates"
+    templates = []
+    template_namespace = 'ScrivitoHandlebarsTemplates'
+
+    Dir["app/assets/javascripts/fiona7/templates/**/*"].each do |fname|
+      if /\.hbs$/ =~ fname
+        puts "Compiling #{fname}"
+        template_name = fname.sub(/.*javascripts\/fiona7\/templates\//, '').sub(/\.hbs$/, '').dump
+        precompiled = HandlebarsAssets::Handlebars.precompile(File.read(fname))
+        template = "Handlebars.template(#{precompiled})"
+
+        templates << <<-TEMPLATE
+            (function() {
+              this.#{template_namespace} || (this.#{template_namespace} = {});
+              this.#{template_namespace}[#{template_name}] = #{template};
+              return this.#{template_namespace}[#{template_name}];
+            }).call(this);
+        TEMPLATE
+      end
+    end
+
+    puts "Writing app/assets/javascripts/fiona7/templates.js"
+    File.open('app/assets/javascripts/fiona7/templates.js', 'w') do |f|
+      templates.each do |t|
+        f.write(t)
+      end
+    end
   end
 end
 

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

@@ -0,0 +1,15 @@
+(function() {
+  _.extend(scrivito, {
+    task_list_command: function() {
+      return scrivito.command.create_instance({
+        id: 'fiona7.task_list',
+        title: scrivito.t('commands.task_list.title'),
+        icon: '',
+
+        execute: function() {
+          scrivito.task_list_dialog.open();
+        }
+      });
+    }
+  });
+}());

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

@@ -0,0 +1,100 @@
+(function() {
+  var dialog, promise, transferred;
+
+  _.extend(scrivito, {
+    task_list_dialog: {
+      open: function() {
+        promise = $.Deferred();
+        transferred = [];
+        dialog = $(scrivito.template.render('task_list_dialog')).appendTo($('#scrivito_editing'));
+
+        load_task_list();
+
+        scrivito.dialog.open_and_adjust_without_transition(dialog);
+        return scrivito.withDialogBehaviour(dialog, promise, {escape: close});
+      }
+    }
+  });
+
+  var fetch_task_list = function(mode) {
+    var base_url = window.location.protocol + '//' + window.location.host + '/__scrivito/';
+    var path = 'tasks';
+
+    // the other option is 'all'
+    mode = mode || 'user';
+
+    return $.ajax(base_url + path, {
+      type: 'GET',
+      data: {mode: mode},
+      dataType: 'json',
+      cache: false
+    });
+  };
+
+  var load_task_list = function(mode) {
+    var objs;
+
+    render(mode);
+
+    fetch_task_list(mode).then(function(result, text_status, xhr) {
+      var tasks = result.tasks;
+
+      _.each(tasks, function(task) {
+        task.obj_data = task.obj;
+        task.obj = scrivito.obj.create_instance(task.obj);
+        task.last_changed = string_date_to_function(task.last_changed);
+      });
+
+      render(mode, tasks);
+    });
+  };
+
+  var string_date_to_function = function(string_date) {
+    return function() {
+      return scrivito.parseDate(string_date);
+    };
+  };
+
+  var render = function(mode, tasks) {
+    mode = mode || 'user';
+
+    dialog.html(scrivito.template.render('task_list_dialog/content', {
+      title: scrivito.t('task_list_dialog.title.' + mode),
+      tasks: tasks,
+      is_loaded: !!tasks,
+      mode_button: scrivito.t('task_list_dialog.mode_toggle.' + mode)
+    }));
+
+    // on click go to page
+    dialog.find('[data-scrivito-obj-id]').on('click', function() {
+      var obj_id = $(this).attr('data-scrivito-obj-id');
+      var task = _.find(tasks || [], function(task) { return task.obj.id() === obj_id; });
+      scrivito.open_obj(task.obj);
+      return false;
+    });
+
+    scrivito.updateAutoHeightFor(dialog.find('.scrivito_changes_dialog_content'));
+
+    dialog.find('.scrivito_cancel').on('click', close);
+
+    // TODO: sortable
+
+    // TODO: my/all changes
+    // mine/all changes toggle
+    dialog.find('.fiona7_toggle_task_list_type').on('click', function() {
+
+      if (mode == 'all') {
+        load_task_list('user');
+      } else {
+        load_task_list('all');
+      }
+    });
+  };
+
+  var close = function() {
+    scrivito.dialog.close_without_transition(dialog);
+    promise.resolve(transferred);
+    return false;
+  };
+
+}());

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

@@ -0,0 +1,30 @@
+(function() {
+  /*
+  var template = function() {
+    return '<li id="fiona7_task_list" class="scrivito_menu_item fiona7_task_list"><span title="' + scrivito.t('commands.task_list.title') + '"><i class="scrivito_icon">&#xf06f;</i> ' + scrivito.t('commands.task_list.title') + '</span></li>';
+  };
+  */
+
+  _.extend(scrivito, {
+    task_list_menu_item: {
+      init: function() {
+        scrivito.menu_bar.register_item_renderer(function(menu_bar) {
+          var workspace_select = menu_bar.find('#scrivito_workspace_select');
+          var changes = menu_bar.find('#scrivito_sdk_workspace_changes');
+          var command = scrivito.task_list_command();
+
+          changes.after(scrivito.template.render('task_list_menu_item', {
+            title: command.title,
+            icon: command.icon
+          }));
+          workspace_select.on('click', '#fiona7_task_list', function() {
+            command.execute();
+          });
+
+
+        });
+
+      }
+    }
+  })
+}());

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

@@ -0,0 +1,106 @@
+            (function() {
+              this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+              this.ScrivitoHandlebarsTemplates["task_list_dialog/content"] = Handlebars.template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "      <table class=\"scrivito_changes_table\">\n"
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tasks : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n        <tbody>\n"
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tasks : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.program(7, data, 0),"data":data})) != null ? stack1 : "")
+    + "        </tbody>\n      </table>\n";
+},"2":function(container,depth0,helpers,partials,data) {
+    return "          <thead>\n            <tr>\n              <th>\n                <span>\n                  "
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"task_list_dialog.user_login",{"name":"translate","hash":{},"data":data}))
+    + "\n                </span>\n              </th>\n              <th>\n                <span>\n                  "
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"task_list_dialog.group_name",{"name":"translate","hash":{},"data":data}))
+    + "\n                </span>\n              </th>\n              <th>\n                <span>\n                  "
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"changes_dialog.description_for_editor",{"name":"translate","hash":{},"data":data}))
+    + "\n                </span>\n              </th>\n              <th>\n                <span>\n                  "
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"changes_dialog.obj_class",{"name":"translate","hash":{},"data":data}))
+    + "\n                </span>\n              </th>\n              <th>\n                <span>\n                  "
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"task_list_dialog.comment",{"name":"translate","hash":{},"data":data}))
+    + "\n                </span>\n              </th>\n              <th>\n                <span>\n                  "
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"changes_dialog.last_changed",{"name":"translate","hash":{},"data":data}))
+    + "\n                </span>\n              </th>\n            </tr>\n          </thead>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "            "
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tasks : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n";
+},"5":function(container,depth0,helpers,partials,data) {
+    return container.escapeExpression((helpers.render || (depth0 && depth0.render) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"task_list_dialog/row",depth0,{"name":"render","hash":{},"data":data}));
+},"7":function(container,depth0,helpers,partials,data) {
+    return "            <tr>\n              <td class=\"scrivito_empty_result\" colspan=\"5\">"
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"task_list_dialog.empty",{"name":"translate","hash":{},"data":data}))
+    + "</td>\n            </tr>\n";
+},"9":function(container,depth0,helpers,partials,data) {
+    return "      <tr><td colspan=\"5\"><i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i></td></tr>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper;
+
+  return "<div class=\"scrivito_changes_dialog_content scrivito_auto_height\">\n  <div class=\"scrivito_modal_header\">\n    <h3>\n      <i class=\"scrivito_icon\">&#xf06f;</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)))
+    + "\n    </h3>\n  </div>\n\n  <div class=\"scrivito_modal_body scrivito_auto_height\">\n"
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.is_loaded : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "")
+    + "  </div>\n</div>\n\n<div class=\"scrivito_modal_footer\">\n  <a href=\"#\" class=\"scrivito_button scrivito_left fiona7_toggle_task_list_type\">\n    "
+    + container.escapeExpression(((helper = (helper = helpers.mode_button || (depth0 != null ? depth0.mode_button : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"mode_button","hash":{},"data":data}) : helper)))
+    + "\n  </a>\n  <a href=\"#\" class=\"scrivito_button scrivito_cancel scrivito_green\">"
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"done",{"name":"translate","hash":{},"data":data}))
+    + "</a>\n</div>\n";
+},"useData":true});
+              return this.ScrivitoHandlebarsTemplates["task_list_dialog/content"];
+            }).call(this);
+            (function() {
+              this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+              this.ScrivitoHandlebarsTemplates["task_list_dialog/row"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper;
+
+  return "<tr title=\""
+    + container.escapeExpression(((helper = (helper = helpers.tooltip || (depth0 != null ? depth0.tooltip : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"tooltip","hash":{},"data":data}) : helper)))
+    + "\" data-scrivito-obj-id=\""
+    + container.escapeExpression(((helper = (helper = helpers.obj_id || (depth0 != null ? depth0.obj_id : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"obj_id","hash":{},"data":data}) : helper)))
+    + "\">\n  <td>\n    <span>\n      "
+    + container.escapeExpression(((helper = (helper = helpers.user_login || (depth0 != null ? depth0.user_login : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"user_login","hash":{},"data":data}) : helper)))
+    + "\n    </span>\n  </td>\n\n  <td>\n    <span>\n      "
+    + container.escapeExpression(((helper = (helper = helpers.group_name || (depth0 != null ? depth0.group_name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"group_name","hash":{},"data":data}) : helper)))
+    + "\n    </span>\n  </td>\n\n  <td><span class=\"scrivito_title\">"
+    + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.obj_data : depth0)) != null ? stack1.description_for_editor : stack1), depth0))
+    + "</span>\n  <td><span class=\"scrivito_obj_class\">"
+    + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.obj_data : depth0)) != null ? stack1.obj_class : stack1), depth0))
+    + "</span></td>\n\n  <td>\n    <span>\n      "
+    + container.escapeExpression(((helper = (helper = helpers.comment || (depth0 != null ? depth0.comment : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"comment","hash":{},"data":data}) : helper)))
+    + "\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}))
+    + "\">\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";
+},"useData":true});
+              return this.ScrivitoHandlebarsTemplates["task_list_dialog/row"];
+            }).call(this);
+            (function() {
+              this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+              this.ScrivitoHandlebarsTemplates["task_list_dialog"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    return "<div class=\"scrivito_changes_overview scrivito_modal_large adjust_dialog\" >\n  <div class=\"scrivito_changes_dialog_content scrivito_auto_height\"></div>\n  <div class=\"scrivito_modal_footer\">\n    <a href=\"#\" class=\"scrivito_button scrivito_cancel scrivito_green\">"
+    + container.escapeExpression((helpers.translate || (depth0 && depth0.translate) || helpers.helperMissing).call(depth0 != null ? depth0 : {},"done",{"name":"translate","hash":{},"data":data}))
+    + "</a>\n  </div>\n</div>\n";
+},"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

@@ -0,0 +1,136 @@
+(function() {
+  $.i18n().load({
+    '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?',
+    'commands.release_obj.dialog.description': 'Eine Arbeitsversion zu veröffentlichen ist endgültig. Dieser Vorgang kann nicht rückgängig gemacht werden.',
+    'commands.release_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
+    'commands.release_obj.dialog.confirm': 'Freigeben',
+    'commands.release_obj.failed': 'Freigabe fehlgeschlagen',
+
+    'commands.edit_obj.title': 'Workflow starten',
+    'commands.edit_obj.dialog.title': 'Workflow starten?',
+    'commands.edit_obj.dialog.description': 'Es wird eine neue Arbeitsversion erstellt.',
+    'commands.edit_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
+    'commands.edit_obj.dialog.confirm': 'Starten',
+    'commands.edit_obj.failed': 'Workflow 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.',
+    'commands.forward_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
+    'commands.forward_obj.dialog.confirm': 'Weiterleiten',
+    'commands.forward_obj.failed': 'Weiterleitung fehlgeschlagen',
+
+    'commands.reject_obj.title': 'Seite ablehnen',
+    'commands.reject_obj.dialog.title': 'Seite ablehnen?',
+    'commands.reject_obj.dialog.description': 'Die Arbeitsversion wird abgelehnt. Dieser Vorgang kann nicht rückgängig gemacht werden.',
+    'commands.reject_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
+    'commands.reject_obj.dialog.confirm': 'Ablehnen',
+    'commands.reject_obj.failed': 'Ablehnung fehlgeschlagen',
+
+    'commands.sign_obj.title': 'Seite abzeichnen',
+    'commands.sign_obj.dialog.title': 'Seite abzeichnen?',
+    'commands.sign_obj.dialog.description': 'Die eingereichte Version wird abgezeichnet. Dieser Vorgang kann nicht rückgängig gemacht werden.',
+    'commands.sign_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
+    'commands.sign_obj.dialog.confirm': 'Abzeichnen',
+    'commands.sign_obj.failed': 'Abzeichnung fehlgeschlagen',
+
+    'commands.commit_obj.title': 'Seite einreichen',
+    'commands.commit_obj.dialog.title': 'Seite einreichen?',
+    'commands.commit_obj.dialog.description': 'Die Arbeitsversion wird eingereicht. Dieser Vorgang kann nicht rückgängig gemacht werden.',
+    'commands.commit_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
+    'commands.commit_obj.dialog.confirm': 'Einreichen',
+    'commands.commit_obj.failed': 'Einreichung fehlgeschlagen',
+
+    'commands.take_obj.title': 'Seite übernehmen',
+    'commands.take_obj.dialog.title': 'Seite übernehmen?',
+    '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',
+
+    '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({
+    '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?',
+    'commands.release_obj.dialog.description': 'Releasing an edited page is final. This operation cannot be reverted.',
+    'commands.release_obj.dialog.placeholder': 'Comment',
+    'commands.release_obj.dialog.confirm': 'Release',
+    'commands.release_obj.failed': 'Release failed',
+
+    'commands.edit_obj.title': 'Start a workflow',
+    'commands.edit_obj.dialog.title': 'Start a workflow for 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': 'Start a workflow',
+    'commands.edit_obj.failed': 'Workflow 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.',
+    'commands.forward_obj.dialog.placeholder': 'Comment',
+    'commands.forward_obj.dialog.confirm': 'Forward',
+    'commands.forward_obj.failed': 'Forward failed',
+
+    'commands.reject_obj.title': 'Reject page',
+    'commands.reject_obj.dialog.title': 'Reject this page?',
+    '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': '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',
+
+    'commands.commit_obj.title': 'Commit page',
+    'commands.commit_obj.dialog.title': 'Commit this page?',
+    'commands.commit_obj.dialog.description': 'Die Arbeitsversion wird eingereicht. Dieser Vorgang kann nicht rückgängig gemacht werden.',
+    'commands.commit_obj.dialog.placeholder': 'Comment',
+    'commands.commit_obj.dialog.confirm': 'Commit',
+    'commands.commit_obj.failed': 'Commit failed',
+
+    'commands.take_obj.title': 'Take page',
+    'commands.take_obj.dialog.title': 'Tage this page?',
+    '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',
+
+    '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({
+    'commands.task_list.title': 'Task list',
+    'task_list_dialog.title.all': 'Task list: All tasks',
+    'task_list_dialog.title.user': 'Task list: My tasks',
+    'task_list_dialog.mode_toggle.all': 'Show only my tasks',
+    'task_list_dialog.mode_toggle.user': 'Show all tasks',
+    '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');
+
+}());

data/app/assets/javascripts/fiona7_ui.js

@@ -8,6 +8,11 @@
 //= require scrivito_patches/cms_rest_api
 //= require scrivito_patches/obj_serializer
 //= require scrivito_patches/binary_utils
+//= 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() {
@@ -15,6 +20,10 @@
   var _ = window._;
   var $ = window.$;
 
+  scrivito.gui.on('open', function() {
+    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 */
@@ -41,6 +50,7 @@
       icon: icon,
       color: 'green',
       accept_button_text: scrivito.t('commands.'+action+'_obj.dialog.confirm'),
+      allow_blank: true,
       accept_button_color: 'green'
     });
   };
@@ -102,116 +112,6 @@
       return deferred;
   };
 
-  $.i18n().load({
-    '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?',
-    'commands.release_obj.dialog.description': 'Eine Arbeitsversion zu veröffentlichen ist endgültig. Dieser Vorgang kann nicht rückgängig gemacht werden.',
-    'commands.release_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
-    'commands.release_obj.dialog.confirm': 'Freigeben',
-    'commands.release_obj.failed': 'Freigabe fehlgeschlagen',
-
-    'commands.edit_obj.title': 'Workflow starten',
-    'commands.edit_obj.dialog.title': 'Workflow starten?',
-    'commands.edit_obj.dialog.description': 'Es wird eine neue Arbeitsversion erstellt.',
-    'commands.edit_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
-    'commands.edit_obj.dialog.confirm': 'Starten',
-    'commands.edit_obj.failed': 'Workflow 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.',
-    'commands.forward_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
-    'commands.forward_obj.dialog.confirm': 'Weiterleiten',
-    'commands.forward_obj.failed': 'Weiterleitung fehlgeschlagen',
-
-    'commands.reject_obj.title': 'Seite ablehnen',
-    'commands.reject_obj.dialog.title': 'Seite ablehnen?',
-    'commands.reject_obj.dialog.description': 'Die Arbeitsversion wird abgelehnt. Dieser Vorgang kann nicht rückgängig gemacht werden.',
-    'commands.reject_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
-    'commands.reject_obj.dialog.confirm': 'Ablehnen',
-    'commands.reject_obj.failed': 'Ablehnung fehlgeschlagen',
-
-    'commands.sign_obj.title': 'Seite abzeichnen',
-    'commands.sign_obj.dialog.title': 'Seite abzeichnen?',
-    'commands.sign_obj.dialog.description': 'Die eingereichte Version wird abgezeichnet. Dieser Vorgang kann nicht rückgängig gemacht werden.',
-    'commands.sign_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
-    'commands.sign_obj.dialog.confirm': 'Abzeichnen',
-    'commands.sign_obj.failed': 'Abzeichnung fehlgeschlagen',
-
-    'commands.commit_obj.title': 'Seite einreichen',
-    'commands.commit_obj.dialog.title': 'Seite einreichen?',
-    'commands.commit_obj.dialog.description': 'Die Arbeitsversion wird eingereicht. Dieser Vorgang kann nicht rückgängig gemacht werden.',
-    'commands.commit_obj.dialog.placeholder': 'Bitte Kommentar eintragen',
-    'commands.commit_obj.dialog.confirm': 'Einreichen',
-    'commands.commit_obj.failed': 'Einreichung fehlgeschlagen',
-
-    'commands.take_obj.title': 'Seite übernehmen',
-    'commands.take_obj.dialog.title': 'Seite übernehmen?',
-    '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',
-
-    '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({
-    '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?',
-    'commands.release_obj.dialog.description': 'Releasing an edited page is final. This operation cannot be reverted.',
-    'commands.release_obj.dialog.placeholder': 'Comment',
-    'commands.release_obj.dialog.confirm': 'Release',
-    'commands.release_obj.failed': 'Release failed',
-
-    'commands.edit_obj.title': 'Start a workflow',
-    'commands.edit_obj.dialog.title': 'Start a workflow for 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': 'Start a workflow',
-    'commands.edit_obj.failed': 'Workflow 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.',
-    'commands.forward_obj.dialog.placeholder': 'Comment',
-    'commands.forward_obj.dialog.confirm': 'Forward',
-    'commands.forward_obj.failed': 'Forward failed',
-
-    'commands.reject_obj.title': 'Reject page',
-    'commands.reject_obj.dialog.title': 'Reject this page?',
-    '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': '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',
-
-    'commands.commit_obj.title': 'Commit page',
-    'commands.commit_obj.dialog.title': 'Commit this page?',
-    'commands.commit_obj.dialog.description': 'Die Arbeitsversion wird eingereicht. Dieser Vorgang kann nicht rückgängig gemacht werden.',
-    'commands.commit_obj.dialog.placeholder': 'Comment',
-    'commands.commit_obj.dialog.confirm': 'Commit',
-    'commands.commit_obj.failed': 'Commit failed',
-
-    'commands.take_obj.title': 'Take page',
-    'commands.take_obj.dialog.title': 'Tage this page?',
-    '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',
-
-    '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": "",

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

@@ -31,7 +31,10 @@
 
     for (k in objParams) {
       if (objParams.hasOwnProperty(k)) {
-        result = scrivito.BinaryUtils.isFile(objParams[k]) || scrivito.BinaryUtils.isBlob(objParams[k]) || scrivito.BinaryUtils.isBlobWithName(objParams[k]);
+        result = objParams[k] && (scrivito.BinaryUtils.isFile(objParams[k]) ||
+            scrivito.BinaryUtils.isBlob(objParams[k]) ||
+            scrivito.BinaryUtils.isBlobWithName(objParams[k])
+            );
         if (result) {
           return result;
         }
@@ -69,7 +72,7 @@
                     fd.append("obj[" + attr + "][" + w + "][" + widgetAttr + "]", widgetValue);
                   } else if (scrivito.BinaryUtils.isBlobWithName(widgetValue)) {
                     fd.append("obj[" + attr + "][" + w + "][" + widgetAttr + "]", widgetValue.blob_to_upload, widgetValue.filename);
-                  } else if (typeof value === 'object') {
+                  } else if (value && typeof value === 'object') {
                     // blob/copy rename
                     for (l in widgetValue) {
                       if (widgetValue.hasOwnProperty(l)) {
@@ -93,7 +96,7 @@
           fd.append("obj[" + attr + "]", value);
         } else if (scrivito.BinaryUtils.isBlobWithName(value)) {
           fd.append("obj[" + attr + "]", value.blob_to_upload, value.filename);
-        } else if (typeof value === 'object') {
+        } else if (value && typeof value === 'object') {
           // blob/copy rename
           for (l in value) {
             if (value.hasOwnProperty(l)) {

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

@@ -6,7 +6,7 @@
       var message = undefined;
 
       // -- PATCH BEGINS HERE --
-      if (typeof error === 'object' && error.message) {
+      if (error && typeof error === 'object' && error.message) {
         scrivito.alertDialog(error.message);
       } else {
         message = scrivito.t('ajax_error.communication');

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

@@ -115,7 +115,7 @@
         }
       } else if (scrivito.BinaryUtils.isFile(value) || scrivito.BinaryUtils.isBlob(value)) {
         return value;
-      } else if (typeof value === 'object' && value.id_to_copy) {
+      } else if (value && typeof value === 'object' && value.id_to_copy) {
         return value;
       } else {
         invalidAttributeValue(value, name, 'A Binary.');
@@ -244,7 +244,7 @@
   }
 
   function isValidReference(value) {
-    return _.isString(value) || value instanceof scrivito.BasicObj;
+    return _.isString(value) || _.isNumber(value) || value instanceof scrivito.BasicObj;
   }
 
   function isValidReferencelistValue(value) {

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

@@ -26,7 +26,7 @@
 
     // -- PATCH BEGINS HERE --
     isBlobWithName: function isBlobWithName(obj) {
-      return typeof obj === 'object' && this.isBlob(obj.blob_to_upload);
+      return obj && typeof obj === 'object' && this.isBlob(obj.blob_to_upload);
     }
   };
 })();

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

@@ -230,7 +230,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         // if params[k] is an array
         if (objParams[k].pop) {
           // file uploads require form data
-          result = scrivito.BinaryUtils.isFile(objParams[k][1]) || scrivito.BinaryUtils.isBlob(objParams[k][1]) || scrivito.BinaryUtils.isBlobWithName(objParams[k][1]);
+          result = objParams[k][1] && (scrivito.BinaryUtils.isFile(objParams[k][1]) || scrivito.BinaryUtils.isBlob(objParams[k][1]) || scrivito.BinaryUtils.isBlobWithName(objParams[k][1]));
           if (result) {
             return result;
           }
@@ -290,7 +290,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         var attr = _step2.value;
 
         // attr is a [type, value] pair
-        if (typeof objParams[attr] === 'object' && objParams[attr].pop) {
+        if (objParams[attr] && typeof objParams[attr] === 'object' && objParams[attr].pop) {
           var _objParams$attr = _slicedToArray(objParams[attr], 2);
 
           var type = _objParams$attr[0];
@@ -309,7 +309,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           } else if (scrivito.BinaryUtils.isBlobWithName(value)) {
             fd.append('params[obj][' + attr + '][]', type);
             fd.append('params[obj][' + attr + '][]', value.blob_to_upload, value.filename);
-          } else if (typeof value === 'object') {
+          } else if (value && typeof value === 'object') {
             // blob/copy rename
             fd.append('params[obj][' + attr + '[]', type);
             var _iteratorNormalCompletion3 = true;
@@ -380,7 +380,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
                       } else if (scrivito.BinaryUtils.isBlobWithName(widgetValue)) {
                         fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
                         fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetValue.blob_to_upload, widgetValue.filename);
-                      } else if (typeof widgetValue === 'object') {
+                      } else if (widgetValue && typeof widgetValue === 'object') {
                         // blob/copy rename
                         fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
                         var _iteratorNormalCompletion6 = true;

data/app/assets/javascripts/scrivito_patches/models/api/basic_obj.js

@@ -126,7 +126,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
           var path = typeof page.provided_path === 'function' && page.provided_path();
           if (path) {
             var blobName = undefined;
-            if (typeof serializedAttributes.blob === 'object') {
+            if (serializedAttributes.blob && typeof serializedAttributes.blob === 'object') {
               blobName = serializedAttributes.blob.name || serializedAttributes.blob.filename;
             } else {
               blobName = undefined;

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

@@ -202,7 +202,7 @@
             var page = scrivito.application_document().page();
             var path = (typeof page.provided_path === 'function') && page.provided_path();
             var blobName;
-            if (typeof serialized_attrs.blob === 'object') {
+            if (serialized_attrs.blob && typeof serialized_attrs.blob === 'object') {
               blobName = serialized_attrs.blob.name || serialized_attrs.blob.filename;
             }
             if (path) {

data/app/controllers/fiona7/tasks_controller.rb

@@ -0,0 +1,30 @@
+require 'fiona7/tasks/loader'
+
+module Fiona7
+  class TasksController < ActionController::Base
+    def index
+      @details_view = self.details_view_lambda
+      @tasks = Fiona7::Tasks::Loader.new(self.user_name).call
+    end
+
+    protected
+    def user_name
+      if params[:mode] == 'user'
+        rsession.user_name
+      else
+        nil
+      end
+    end
+
+
+    def details_view_lambda
+      lambda do |obj|
+        begin
+          lookup_context.find(obj.details_view_path).present?
+        rescue ActionView::MissingTemplate
+          false
+        end
+      end
+    end
+  end
+end

data/app/helpers/fiona7_override_helper.rb

@@ -32,7 +32,6 @@ module Fiona7OverrideHelper
     tt = lambda {|action|
       I18n.t(:"fiona7.workflow.#{action}", locale: locale)
     }
-    # TODO: add translation
     html = <<-EOHTML
     <div class="btn-group workflow dropdown">
       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

data/app/models/rails_connector/task.rb

@@ -0,0 +1,19 @@
+module RailsConnector
+  class Task < AbstractModel
+    self.primary_key = "task_id"
+
+    def full_task_type
+      case task_type
+      when 'E'
+        'edit'
+      when 'S'
+        'sign'
+      end
+    end
+
+    def time_stamp_date
+      value = self.time_stamp
+      RailsConnector::DateAttribute.parse(value) unless value.nil?
+    end
+  end
+end

data/app/views/fiona7/tasks/index.jbuilder

@@ -0,0 +1,20 @@
+json.tasks @tasks do |task|
+  json.user_login     task.user_login
+  json.group_name     task.group_name
+  json.last_changed   task.obj.last_changed.to_iso
+  json.id             task.id
+  json.obj_id         task.obj.id
+  json.comment        task.comment
+
+  json.obj do
+    json.id                       task.obj.id
+    json.obj_class                task.obj.obj_class
+    json.description_for_editor   task.obj.description_for_editor
+    json.modification             task.obj.modification
+    json.is_binary                task.obj.binary?
+    json.has_children             task.obj.children.any?
+    json.has_conflict             task.obj.has_conflict?
+    json.has_details_view         @details_view[task.obj]
+    json.parent_path              task.obj.parent_path
+  end
+end

data/config/locales/workspace.yml

@@ -0,0 +1,9 @@
+de:
+  fiona7:
+    workspace:
+      rtc: 'Arbeitskopie'
+
+en:
+  fiona7:
+    workspace:
+      rtc: 'Working copy'

data/config/precedence_routes.rb

@@ -24,6 +24,8 @@ Fiona7::Engine.routes.draw do
 
 
   get '/__scrivito/objs/:id/release/preview(.:format)', to: 'fiona7/release#preview', as: :fiona7_release_preview
+
+  get '/__scrivito/tasks', to: 'fiona7/tasks#index', as: :fiona7_tasks
 end
 
 Scrivito::SdkEngine.routes.draw do

data/infopark_fiona7.gemspec

@@ -15,11 +15,12 @@ Gem::Specification.new do |s|
   s.description = "scrivito-compatible interface for classic Fiona"
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md", "infopark_fiona7.gemspec"].reject do |f|
-    /^app\/assets.*\.es6\.js$/ =~ f
+    /^app\/assets.*\.es6\.js$/ =~ f ||
+      /^app\/assets.*\.hbs$/ =~ f
   end.sort
 
   s.add_dependency "rails", "~> 4.2.2"
-  s.add_dependency "scrivito", "= 1.5.3"
+  s.add_dependency "scrivito", "= 1.5.4"
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"

data/lib/fiona7/attribute_writers/referencelist_as_linklist.rb

@@ -5,7 +5,7 @@ module Fiona7
     class ReferencelistAsLinklist < AttributeWriter
       def call(value, claimed_type=nil)
         # FIXME: use a repository to improve performance
-        ids = value || []
+        ids = (value || []).map(&:to_s)
         if ids.empty?
           self.obj.set(self.attr_name, [])
         else

data/lib/fiona7/attribute_writers/referencelist_as_text.rb

@@ -5,7 +5,7 @@ module Fiona7
   module AttributeWriters
     class ReferencelistAsText < AttributeWriter
       def call(value, claimed_type=nil)
-        ids = value || []
+        ids = (value || []).map(&:to_s)
         self.obj.set(self.attr_name, Helpers::JsonSerializer.new.call(ids))
       end
     end

data/lib/fiona7/engine.rb

@@ -55,6 +55,9 @@ require 'fiona7/scrivito_user'
 
 require 'fiona7/type_synchronizer'
 
+require 'fiona7/tasks/task'
+require 'fiona7/tasks/loader'
+
 
 require 'fiona7/naive_search_engine'
 require 'fiona7/verity_search_engine'

data/lib/fiona7/forbidden_obj_classes.rb

@@ -0,0 +1,17 @@
+require 'fiona7/obj_class_name_mangler'
+
+module Fiona7
+  class ForbiddenObjClasses
+    SYSTEM_CLASSES = ['X_Generic', 'X_Image', 'X_Container'].freeze
+
+    def call
+      # NOTE: to_s handles shadow classes properly
+      widget_classes = Scrivito.models.widgets.map(&:to_s)
+      widget_obj_classes = widget_classes.map do |obj_class|
+        Fiona7::ObjClassNameMangler.new(obj_class).mangle
+      end
+
+      SYSTEM_CLASSES + widget_obj_classes
+    end
+  end
+end

data/lib/fiona7/tasks/loader.rb

@@ -0,0 +1,54 @@
+require 'fiona7/forbidden_obj_classes'
+require 'fiona7/tasks/task'
+
+module Fiona7
+  module Tasks
+    class Loader
+      def initialize(user_name=nil, forbidden_classes=Fiona7::ForbiddenObjClasses.new.call)
+        self.user_name         = user_name
+        self.forbidden_classes = forbidden_classes
+      end
+
+      def call
+        raw_tasks = RailsConnector::Task.where(self.user_login_condition).joins(
+          "INNER JOIN #{Fiona7::EditedObj.table_name} objs ON objs.obj_id = #{RailsConnector::Task.table_name}.obj_id"
+        ).where(
+          "objs.obj_class NOT IN (?)", self.forbidden_classes
+        ).order("#{RailsConnector::Task.table_name}.time_stamp DESC")
+
+        objs = nil
+        Scrivito::Workspace.find('rtc').as_current do
+          objs = Hash[
+            Scrivito::BasicObj.find(raw_tasks.map(&:obj_id)).map {|obj|
+              [obj.id.to_i, obj]
+            }
+          ]
+        end
+
+        real_tasks = raw_tasks.map do |raw_task|
+          if obj = objs[raw_task.obj_id]
+            Fiona7::Tasks::Task.new(
+              raw_task.task_id, obj, raw_task.full_task_type,
+              raw_task.title, raw_task.user_login, raw_task.group_name,
+              raw_task.time_stamp_date, raw_task.task_comment
+            )
+          end
+        end
+
+        # NOTE: this will cause to hide tasks which do not have 
+        # a valid scrivito obj assigned
+        real_tasks.compact
+      end
+
+      protected
+      attr_accessor :user_name, :forbidden_classes
+      def user_login_condition
+        if self.user_name
+          {user_login: self.user_name}
+        else
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/tasks/task.rb

@@ -0,0 +1,6 @@
+module Fiona7
+  module Tasks
+    class Task < Struct.new(:id, :obj, :type, :title, :user_login, :group_name, :timestamp, :comment)
+    end
+  end
+end

data/lib/fiona7/verity_search_engine.rb

@@ -139,7 +139,7 @@ module Fiona7
         if [:objClass, :obj_id, :permalink, :lastChanged, :name].include?(field)
           fields = [field.to_s]
         else
-          fields = Fiona7::AttributeNamesFromQueries.new(field.to_s, @query).attributes || Fiona7::AttributeNamesFromCms.new(field.to_s).attributes || [field.to_s]
+          fields = (Fiona7::AttributeNamesFromQueries.new(field.to_s, @query).attributes || Fiona7::AttributeNamesFromCms.new(field.to_s).attributes).presence || [field.to_s]
           # NOTE: verity does not like more than 94 fields in its queries
           # so to be safe we limit the number of fields to 80
           fields = fields[0, 80]

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.5.3.2.0"
+  VERSION = "1.5.4.3.0"
 end

data/lib/fiona7/version_helper.rb

@@ -5,60 +5,65 @@ require 'digest/sha1'
 
 module Fiona7
   class VersionHelper
-    attr_reader :revision_id, :content_state_id, :base_revision_id, :base_content_state_id
+    attr_reader :workspace_id, :revision_id, :content_state_id, :base_revision_id, :base_content_state_id
     def initialize(workspace_id)
-      @workspace_id = workspace_id.to_sym
-      if @workspace_id == :published
-        @revision_id =
-          @content_state_id =
-          @base_revision_id =
-          @base_content_state_id = published_revision_id
+      self.workspace_id = workspace_id.to_sym
+
+      if self.workspace_id == :published
+        self.compute_for_published
       else
-        @revision_id = 
-          @content_state_id = rtc_revision_id
-        @base_revision_id =
-          @base_content_state_id = "f" * 40 #published_revision_id
+        self.compute_for_rtc
       end
     end
 
     protected
-    def published_revision_id
-      return @published_revision_id if @published_revision_id
-      klass        = ReleasedObj
-      # only one query executed
-      query         = ReleasedObj.select('max(last_changed), count(*)').to_sql
-      last_changed, obj_count = *ReleasedObj.connection.execute(query).first
-      revision_id  = Digest::SHA1.hexdigest("published:#{last_changed}:#{obj_count}").sub(/^./, 'f')
-      # tag the revision as published
-      revision_id[0] = 'f'
+    attr_writer :workspace_id, :revision_id, :content_state_id, :base_revision_id, :base_content_state_id
+
+    def compute_for_published
+      # NOTE: with this implementation
+      #
+      #   released content changed => revision change
+      #
+      # but not neccessarily
+      #
+      #   revision change => released content changed
+      #
+      query         = Fiona7::WriteObj.select('max(last_changed), count(*)').where('is_released = 1 AND is_edited = 0').to_sql
+      last_changed, obj_count = *Fiona7::WriteObj.connection.execute(query).first
 
-      #begin 
-      #  raise
-      #rescue => e
-      #  Rails.logger.debug(e.backtrace.join("\n"))
-      #end
+      # tag + padding + obj_count (hex) + last changed
+      revision_id = "f" + ('0' * 17) + ("%08x" % obj_count.to_i) + last_changed.to_s
 
-      @published_revision_id = revision_id
+      @revision_id =
+        @content_state_id =
+        @base_revision_id =
+        @base_content_state_id = revision_id
     end
 
-    def rtc_revision_id
-      return @rtc_revision_id if @rtc_revision_id
-      klass       = EditedObj
+    def compute_for_rtc
+      first_query = Fiona7::WriteObj.select('1, count(*), max(last_changed), NULL').to_sql
+      second_query= Fiona7::WriteObj.select("obj_id, is_released, last_changed, attr_values").order("last_changed DESC").limit(23).to_sql
+      third_query = Fiona7::WriteObj.select('1, count(*), max(last_changed), NULL').where('is_released = 1 AND is_edited = 0').to_sql
+      union_query = "SELECT * FROM ( #{first_query} ) QUERY1 UNION ALL SELECT * FROM ( #{second_query} ) QUERY2 UNION ALL SELECT * FROM ( #{third_query} ) QUERY3"
 
-      first_query = klass.select("obj_id, count(*), last_changed, attr_values").to_sql
-      # NOTE: the hidden assumption here is that no more than 23 object have been changed in the last second
-      second_query= klass.select("obj_id, is_released, last_changed, attr_values").order("last_changed DESC").limit(23).to_sql
-      union_query = "SELECT * FROM ( #{first_query} ) QUERY1 UNION ALL SELECT * FROM ( #{second_query} ) QUERY2"
       # only one query executed
-      results     = EditedObj.connection.execute(union_query).to_a
-      obj_count   = results.shift[1]
-      changed     = results
+      results                   = Fiona7::WriteObj.connection.execute(union_query).to_a
+      _, obj_count, last_changed= *results.shift
+      _, pobj_count, plast_changed= *results.pop
+      changed_contents          = results
+
+      content_digest            = Digest::SHA1.hexdigest("#{changed_contents}")[0,17]
+
+      # tag + content digest + obj_count (hex) + last changed
+      rtc_version_id            = "b" + content_digest + ("%08x" % obj_count.to_i) + last_changed.to_s
+      # tag + padding + obj_count (hex) + last changed
+      published_version_id      = "f" + ('0' * 17) + ("%08x" % pobj_count.to_i) + plast_changed.to_s
 
-      revision_id = Digest::SHA1.hexdigest("rtc:#{changed}:#{obj_count}")
+      @revision_id = 
+        @content_state_id = rtc_version_id
 
-      # tag the revision as edited/rtc
-      revision_id[0] = 'b'
-      @rtc_revision_id = revision_id
+      @base_revision_id =
+        @base_content_state_id = published_version_id
     end
 
   end

data/lib/fiona7/workspace.rb

@@ -26,7 +26,8 @@ module Fiona7
 
     def title
       if self.id == :rtc
-        'Arbeitskopie'
+
+        self.localized_title
       else
         nil
       end
@@ -74,5 +75,11 @@ module Fiona7
 
     protected
     attr_reader :version_helper
+    def localized_title
+      locale = Scrivito::Configuration.ui_locale || I18n.locale
+      I18n.t(:"fiona7.workspace.rtc", locale: locale)
+    rescue
+      'Arbeitskopie '
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.5.3.2.0
+  version: 1.5.4.3.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,11 @@ files:
 - app/assets/images/fiona7-logo.png
 - app/assets/images/fiona7-marker.png
 - app/assets/javascripts/fiona7.js
+- app/assets/javascripts/fiona7/task_list_command.js
+- app/assets/javascripts/fiona7/task_list_dialog.js
+- app/assets/javascripts/fiona7/task_list_menu_item.js
+- app/assets/javascripts/fiona7/templates.js
+- app/assets/javascripts/fiona7/translations.js
 - app/assets/javascripts/fiona7_ui.js
 - app/assets/javascripts/scrivito_patches/ajax.js
 - app/assets/javascripts/scrivito_patches/ajax_error_handling.js
@@ -153,6 +158,7 @@ files:
 - app/controllers/fiona7/default_scrivito_cms_controller.rb
 - app/controllers/fiona7/release_controller.rb
 - app/controllers/fiona7/sessions_controller.rb
+- app/controllers/fiona7/tasks_controller.rb
 - app/controllers/fiona7/workflow_controller.rb
 - app/controllers/fiona7_login_page_controller.rb
 - app/controllers/scrivito/cms_dispatch_controller.rb
@@ -164,12 +170,15 @@ files:
 - app/models/fiona7/edited_obj.rb
 - app/models/fiona7/internal_released_obj.rb
 - app/models/fiona7/released_obj.rb
+- app/models/fiona7/task.rb
 - app/models/fiona7/write_obj.rb
 - app/models/fiona7_login_page.rb
+- app/models/rails_connector/task.rb
 - app/models/x_container.rb
 - app/models/x_generic.rb
 - app/models/x_image.rb
 - app/views/fiona7/release/preview.html.erb
+- app/views/fiona7/tasks/index.jbuilder
 - app/views/fiona7_login_page/index.html.erb
 - app/views/layouts/fiona7_login_page_layout.html.erb
 - app/views/scrivito/ui/index.html.erb
@@ -180,6 +189,7 @@ files:
 - config/locales/permissions.yml
 - config/locales/release.yml
 - config/locales/workflow.yml
+- config/locales/workspace.yml
 - config/precedence_routes.rb
 - infopark_fiona7.gemspec
 - lib/fiona7/access_permission_check.rb
@@ -255,6 +265,7 @@ files:
 - lib/fiona7/facet_builder.rb
 - lib/fiona7/fiona_connector_patches/basic_obj.rb
 - lib/fiona7/fiona_connector_patches/cms_accessible.rb
+- lib/fiona7/forbidden_obj_classes.rb
 - lib/fiona7/in_editable_view.rb
 - lib/fiona7/initializer.rb
 - lib/fiona7/json/obj_decorator.rb
@@ -311,6 +322,8 @@ files:
 - lib/fiona7/shadow_classes.rb
 - lib/fiona7/super_object_finder.rb
 - lib/fiona7/table_switcher.rb
+- lib/fiona7/tasks/loader.rb
+- lib/fiona7/tasks/task.rb
 - lib/fiona7/tools/attribute_remover.rb
 - lib/fiona7/type_loader.rb
 - lib/fiona7/type_register.rb