scrivito_sdk 0.66.0.rc1 → 0.66.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5732dd6aaddb2791e2954b68935774f065b3a51
-  data.tar.gz: 49de2acf02301e6724538cca010850dc1110a9f6
+  metadata.gz: 50aa821e2e4ac823b30dbec2ba6f43bef68c28f9
+  data.tar.gz: 2334008ac34e85b9f1487a3f014512a77ac62a29
 SHA512:
-  metadata.gz: ef22bbee7de80d523322d9d0caa469f8eb93f77fef5568ba57e88ce0187fcc0bda1087b1eaba9304e1e28123e7b8323b854e35493526deb4b06bc729b325fb7c
-  data.tar.gz: 249d37a58feb21f1b9cc660d691b4e904957cab119fefc49133c1ab9a54345fadb6eb97677c5befd71eb3ad2e3b94a4dee36cafd825185f632820cf0cf1946ba
+  metadata.gz: 75a5ab9b2baccd4503b16de702d500a6bf6e7e7ed02930503930cdadc03843f5922db642139b56673b12ebe387e037120ae07d0c378341130581bef71fd5402c
+  data.tar.gz: 8b48fb63714fc247c91745f4b86d8169d1352502623e6c0a54101eadf62fe98580aee449466c04e8fd74ae8dfd3e5b535288ac801e286c69b9aaa351077ddf95

data/app/controllers/scrivito/webservice_controller.rb

@@ -57,6 +57,12 @@ class WebserviceController < ActionController::Base
   def render_empty_json
     render 'scrivito/webservice/empty', formats: :json
   end
+
+  def can_user_read_workspace?(workspace)
+    can_user_access_workspace?(:read, workspace)
+  end
+
+  helper_method :can_user_read_workspace?
 end
 
 end

data/app/controllers/scrivito/workspaces_controller.rb

@@ -6,9 +6,7 @@ module Scrivito
     around_action :authorize_current_workspace_publish, only: [:check, :publish]
 
     def index
-      @workspaces = Workspace.all.select do |workspace|
-        can_user_access_workspace?(:read, workspace)
-      end
+      @workspaces = Workspace.all.select(&method(:can_user_read_workspace?))
       render :workspaces
     end
 

data/app/views/scrivito/webservice/_workspace.json.jbuilder

@@ -1,5 +1,8 @@
 json.extract! workspace, :id, :title
+
 json.memberships workspace.memberships do |membership|
   json.extract! membership, :user_id, :role
   json.description membership.user.description
 end
+
+json.is_accessible can_user_read_workspace?(workspace)

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Fri Jul  3 13:41:22 2015
+## Certificate data from Mozilla as of: Mon Jul 13 11:31:35 2015
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/assets/javascripts/scrivito_ui.js

@@ -27718,7 +27718,8 @@ $.i18n().load({
   'commands.sort_items.too_less_children': 'Die Navigation kann nicht sortiert werden, weil sie weniger als zwei Elemente enthält.',
 
   'commands.select_workspace.x_and_1_owner': '$1 und 1 weiterer Besitzer',
-  'commands.select_workspace.x_and_y_owners': '$1 und $2 weitere Besitzer',
+  'commands.select_workspace.x_and_n_owners': '$1 und $2 weitere Besitzer',
+  'commands.select_workspace.disabled': 'Diese Arbeitskopie kann aufgrund fehlender Benutzerrechte nicht ausgewählt werden',
 
   'commands.choose_and_create_widget.title': 'Widget einfügen',
   'commands.choose_and_create_widget.disabled': 'Sie können hier keine Widgets einfügen.',
@@ -27976,7 +27977,8 @@ $.i18n().load({
   'commands.sort_items.too_less_children': 'This navigation cannot be sorted because it consists of less than two items.',
 
   'commands.select_workspace.x_and_1_owner': '$1 and 1 other owner',
-  'commands.select_workspace.x_and_y_owners': '$1 and $2 other owners',
+  'commands.select_workspace.x_and_n_owners': '$1 and $2 other owners',
+  'commands.select_workspace.disabled': 'This working copy can not be selected due to missing user permissions.',
 
   'commands.choose_and_create_widget.title': 'Insert widget',
   'commands.choose_and_create_widget.disabled': 'You cannot insert any widgets here.',
@@ -29491,75 +29493,100 @@ var scrivito = {};
   });
 }());
 (function() {
+  var render, current_page;
+
   _.extend(scrivito, {
     menu_bar_conflict_indicator: {
       init: function() {
         scrivito.menu_bar.register_item_renderer(function(menu_bar) {
-          var conflict_warning = $(scrivito.template.render('menu_bar_conflict_indicator'))
-            .appendTo(menu_bar.find('#scrivito_menu_bar_conflict_indicator'));
-
-          var render_icon_and_menu = function(icon_color, menu_commands) {
-            conflict_warning.show();
-            conflict_warning.find('.scrivito_icon').addClass('scrivito_' + icon_color);
-            conflict_warning.on('click', function() {
-              scrivito.static_menus.toggle(conflict_warning, menu_commands);
-            });
+          render = function(color, commands) {
+            var target = $(scrivito.template.render('menu_bar_conflict_indicator'))
+              .appendTo(menu_bar.find('#scrivito_menu_bar_conflict_indicator'));
+            target.show();
+            target.find('.scrivito_icon').addClass('scrivito_'+color);
+            target.on('click', function() { scrivito.static_menus.toggle(target, commands); });
           };
 
-          var current_page = scrivito.application_document().page();
+          current_page = scrivito.application_document().page();
           if (current_page) {
-            if (current_page.has_conflict()) {
-              var conflict_commands = [{
-                id: function() { return 'scrivito.menu_bar_conflict_indicator.header'; },
-                render: function() {
-                  return scrivito.template.render('menu_bar_conflict_indicator/conflict');
-                }
-              }];
-              render_icon_and_menu('red', conflict_commands);
-            } else {
-              if (scrivito.in_editable_view()) {
-                current_page.is_outdated().done(function(result) {
-                  if (!!result) {
-                    var outdated_commands = [{
-                      id: function() { return 'scrivito.menu_bar_conflict_indicator.header'; },
-                      render: function() {
-                        return scrivito.template.render('menu_bar_conflict_indicator/warn', {
-                          headline_color: 'red',
-                          headline: scrivito.t('menu_bar_conflict_indicator.outdated_headline'),
-                          description: scrivito.t('menu_bar_conflict_indicator.outdated_description')
-                        });
-                      }
-                    }].concat([
-                      scrivito.rebase_workspace_command(scrivito.editing_context.selected_workspace)
-                    ]);
-                    render_icon_and_menu('red', outdated_commands);
-                  } else {
-                    current_page.conflicting_workspaces().done(function(workspaces) {
-                      if (workspaces.length) {
-                        var warn_commands = [{
-                          id: function() { return 'scrivito.menu_bar_conflict_indicator.header'; },
-                          render: function() {
-                            return scrivito.template.render('menu_bar_conflict_indicator/warn', {
-                              headline_color: 'yellow',
-                              headline: scrivito.t('menu_bar_conflict_indicator.warn_headline'),
-                              description: scrivito.t('menu_bar_conflict_indicator.warn_description')
-                            });
-                          }
-                        }].concat(_.map(workspaces, function(ws) {
-                          return scrivito.select_workspace_command(ws);
-                        }));
-                        render_icon_and_menu('yellow', warn_commands);
-                      }
-                    });
-                  }
-                });
-              }
-            }
+            check_conflict(function() {
+              check_uptodate(function() {
+                check_potential_conflicts();
+              });
+            });
           }
         });
       }
     }
   });
+
+  var check_conflict = function(next) {
+    if (current_page.has_conflict()) {
+      render_conflict();
+    } else {
+      next();
+    }
+  };
+
+  var check_uptodate = function(next) {
+    if (scrivito.in_editable_view()) {
+      current_page.is_outdated().done(function(is_outdated) {
+        if (is_outdated) {
+          render_outdated();
+        } else {
+          next();
+        }
+      });
+    }
+  };
+
+  var check_potential_conflicts = function() {
+    current_page.conflicting_workspaces().done(function(workspaces) {
+      if (workspaces.length) {
+        render_potential_conflicts(workspaces);
+      }
+    });
+  };
+
+  var render_conflict = function() {
+    render('red', [{
+      id: function() { return 'scrivito.menu_bar_conflict_indicator.header'; },
+      render: function() {
+        return scrivito.template.render('menu_bar_conflict_indicator/conflict');
+      }
+    }]);
+  };
+
+  var render_outdated = function() {
+    render('red', [
+      {
+        id: function() { return 'scrivito.menu_bar_conflict_indicator.header'; },
+        render: function() {
+          return scrivito.template.render('menu_bar_conflict_indicator/warn', {
+            headline_color: 'red',
+            headline: scrivito.t('menu_bar_conflict_indicator.outdated_headline'),
+            description: scrivito.t('menu_bar_conflict_indicator.outdated_description')
+          });
+        }
+      },
+      scrivito.rebase_workspace_command(scrivito.editing_context.selected_workspace)
+    ]);
+  };
+
+  var render_potential_conflicts = function(workspaces) {
+    render('yellow', [{
+      id: function() { return 'scrivito.menu_bar_conflict_indicator.header'; },
+      render: function() {
+        return scrivito.template.render('menu_bar_conflict_indicator/warn', {
+          headline_color: 'yellow',
+          headline: scrivito.t('menu_bar_conflict_indicator.warn_headline'),
+          description: scrivito.t('menu_bar_conflict_indicator.warn_description')
+        });
+      }
+    }].concat(_.map(workspaces, function(ws) {
+      return scrivito.select_workspace_command(ws);
+    })));
+  };
 }());
 (function() {
   _.extend(scrivito, {
@@ -31141,6 +31168,10 @@ var scrivito = {};
         var that = {
           id: function() {
             return params.id;
+          },
+
+          description: function() {
+            return params.description;
           }
         };
 
@@ -31566,6 +31597,19 @@ var scrivito = {};
               var promise = $.Deferred();
               return size === 0 ? promise.reject() : promise.resolve();
             });
+          },
+
+          owners: function() {
+            return _.map(_.where(that.memberships(), {role: 'owner'}), function(membership) {
+              return scrivito.user.create_instance({
+                id: membership.user_id,
+                description: membership.description
+              });
+            });
+          },
+
+          is_accessible: function() {
+            return data.id === 'published' || data.is_accessible;
           }
         };
 
@@ -33509,39 +33553,35 @@ var scrivito = {};
         icon: workspace.icon(),
         subtitle: subtitle(workspace),
 
+        disabled: function() {
+          if (!workspace.is_accessible()) {
+            return scrivito.t('commands.select_workspace.disabled');
+          }
+        },
+
         execute: function() {
-          var promise = scrivito.change_editing_context({workspace_id: workspace.id()});
-          scrivito.with_saving_overlay(promise);
+          scrivito.with_saving_overlay(
+            scrivito.change_editing_context({workspace_id: workspace.id()}));
         }
       });
     }
   });
 
   var subtitle = function(workspace) {
-    var owner_names = workspace_owner_names(workspace);
-    var first_owner = _.first(owner_names);
-
-    switch (owner_names.length) {
+    var owners = workspace.owners();
+    var owner = owners[0];
+    switch (owners.length) {
       case 0:
         return undefined;
       case 1:
-        return first_owner;
+        return owner.description();
       case 2:
-        return scrivito.t('commands.select_workspace.x_and_1_owner', first_owner);
+        return scrivito.t('commands.select_workspace.x_and_1_owner', owner.description());
       default:
-        var others = owner_names.length - 1;
-        return scrivito.t('commands.select_workspace.x_and_y_owners', first_owner, others);
+        return scrivito.t('commands.select_workspace.x_and_n_owners', owner.description(),
+          owners.length - 1);
     }
   };
-
-  var workspace_owner_names = function(workspace) {
-    var owners = _.select(workspace.memberships(), function(user) {
-      return user.role === 'owner';
-    });
-    return _.map(owners, function(owner) {
-      return owner.description;
-    });
-  };
 }());
 (function() {
   _.extend(scrivito, {