infopark_cloud_connector 6.9.5 → 7.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQxZDQ1MTE2NzI2YjU3MTQ3Zjg0MDY0MWFjZDEyZTE4Y2Q0MzQzMg==
+    Njg3ODYzOWQxMmFhNzRjNTAyNmYzNWFlMGRkMmIyZDc0NjBlNmY3NQ==
   data.tar.gz: !binary |-
-    YmNmZjYwMGZiYWRmZjRmODEzNGZlNGEwMWY4YmVlOTIyOTBiOTZjNA==
+    YWU2ZTYxNzZlMTkyYjI2OTEzZWJlMmY2NzIwODA1ZTczOGM5N2NjMA==
 SHA512:
   metadata.gz: !binary |-
-    Mzk1OGU2Y2FjNmY0Mzc4ZDA5MmFhOTVkZDI4ZWQ0ZjA2YjI0NmEyNjYzZDMw
-    MDRiNzIwNDNjMzhkZjI4MDJjNTliNDI0NDg5ZDM3NzllOTBiNDcwZjg3NjQy
-    ODI5NGNhZjNhMzQ0MzgzNTE3MDVjMGRlMzg3NzUwMDM2MDU2MDU=
+    NDBhZTc0Y2M1NzRmYjg2ODg4NDRhZDBjZWZhYjRmYTUzNWJiOTEyZjFkNzUy
+    Nzg5MDdmZmNkYzBkMTYxZGJlODEyYTIwMDk5YmE2NTFiNjVhZjIwNjBjMTU0
+    NDk4M2NhMzI3MDQ1M2RhMzRhOWZhNGYxMDBiMjQzZGNkMmRiMWM=
   data.tar.gz: !binary |-
-    ZmNiYjYyMTkzY2M3NzkzYTcwM2NlODk0YjRlNDExZDQ2MzM2ZTA0ZDc3M2U2
-    YmRlM2EyNTUzNzlmMGJlOTg4YzA2NjhjOGNhNzFiOWNlMDhhMzEyNDVjNDg5
-    N2QyNWI0MjhmZDU2OTFhZWZkMTkzOGZlYzA4NmNjOGMzMjFkNTc=
+    MWE0ODA5Mzk3ZjliOGMwNTBiNDk5NjA1YThjODliNDA1NjVmOGIwYWI0Yzc2
+    ZDUyOGMyY2UxMDM2ZTUxM2QxNTNiNmMzMTZhZmRlZDc2Y2ZiN2ZmNzQ2NDQ5
+    Y2VhYzk5ZGJmZmVkMzVkZGUzYmYzN2Y0ZWQyNGUxMDg0OTViMTM=

data/app/controllers/rails_connector/default_cms_controller.rb

@@ -8,7 +8,6 @@ module RailsConnector
   class DefaultCmsController < ApplicationController
     include CmsAccessible
     before_filter :load_object
-    before_filter :ensure_object_is_active
     before_filter :ensure_object_is_permitted
     before_filter :set_google_expire_header
 

data/app/controllers/rails_connector/objs_controller.rb

@@ -1,16 +1,12 @@
 module RailsConnector
 
   class ObjsController < WebserviceController
-    before_filter :load_object, only: [:show, :edit, :update, :destroy, :widget_class_selection,
-        :create_widget, :edit_widget]
-
-    def show
-      render json: {markup: render_to_string(layout: false)}
-    end
+    before_filter :load_object, only: [:edit, :update, :destroy,
+        :show_widget, :widget_class_selection, :create_widget, :edit_widget]
 
     def create
-      created_obj = CmsRestApi.task_unaware_request(:post,
-        "revisions/#{Workspace.current.revision_id}/objs",
+      created_obj = task_unaware_request(:post,
+        "workspaces/#{Workspace.current.id}/objs",
         {obj: obj_params}
       )
       render json: created_obj
@@ -21,8 +17,8 @@ module RailsConnector
     end
 
     def update
-      changed_obj = CmsRestApi.task_unaware_request(:put,
-        "revisions/#{Workspace.current.revision_id}/objs/#{params[:id]}",
+      changed_obj = task_unaware_request(:put,
+        "workspaces/#{Workspace.current.id}/objs/#{params[:id]}",
         {obj: obj_params}
       )
       render json: changed_obj
@@ -58,6 +54,12 @@ module RailsConnector
       render json: page_class_names.compact
     end
 
+    def show_widget
+      @widget = @obj.widget_from_pool(params[:widget_id])
+
+      render json: {markup: render_to_string(layout: false)}
+    end
+
     def widget_class_selection
       valid_widget_classes = @obj.valid_widget_classes_for(params[:field_name]) || all_widget_classes
       valid_widget_classes.map!(&:to_s)
@@ -71,23 +73,25 @@ module RailsConnector
     end
 
     def create_widget
-      widget = CmsRestApi.task_unaware_request(:post,
-        "revisions/#{Workspace.current.revision_id}/objs", {
-          obj: {
-            _path: "/_widgets/#{@obj.id}/#{SecureRandom.hex}",
-            _obj_class: params[:obj_class],
-          },
-        }
-      )
+      widget_pool_id = BasicObj.generate_widget_pool_id
+
+      task_unaware_request(:put, "workspaces/#{Workspace.current.id}/objs/#{params[:id]}",
+          {obj: {_widget_pool: {widget_pool_id => {_obj_class: params[:obj_class]}}}})
+
+      Workspace.current = Workspace.find(Workspace.current.id)
+      @obj.reload
 
-      @widget = Obj.find(widget['id'])
+      @widget = @obj.widget_from_pool(widget_pool_id)
 
       render json: {markup: render_to_string(layout: false)}
     end
 
     def edit_widget
-      markup = WidgetRenderer.new(request).
-          process(:edit, @obj, current_page, params[:field_name], @obj.widget_container)
+      @widget = @obj.widget_from_pool(params[:widget_id])
+
+      markup = WidgetRenderer.new(request)
+          .process(:edit, @widget, current_page, params[:field_name], @obj)
+
       render json: {markup: markup}
     end
 
@@ -120,13 +124,11 @@ module RailsConnector
 
       copied_attributes['_path'] = "#{target_path}/#{SecureRandom.hex(6)}"
 
-      CmsRestApi.task_unaware_request(
-        :post, "revisions/#{Workspace.current.revision_id}/objs", obj: copied_attributes)
+      task_unaware_request(:post, "workspaces/#{Workspace.current.id}/objs", obj: copied_attributes)
     end
 
     def get_obj_attributes(id)
-      CmsRestApi.task_unaware_request(
-        :get, "revisions/#{Workspace.current.revision_id}/objs/#{id}")
+      task_unaware_request(:get, "workspaces/#{Workspace.current.id}/objs/#{id}")
     end
 
     def parent_path(path)
@@ -139,14 +141,16 @@ module RailsConnector
     helper_method :current_page
 
     def all_page_classes
-      page_classes = CmsRestApi.task_unaware_request(:get,
-          "revisions/#{Workspace.current.revision_id}/obj_classes")['results']
+      page_classes = task_unaware_request(:get,
+          "workspaces/#{Workspace.current.id}/obj_classes")['results']
       page_classes.map { |page_class| page_class['name'] }.sort
     end
 
     def all_widget_classes
       Dir[Rails.root + 'app/widgets/*'].map { |path| File.basename(path).camelize }.sort
     end
+
+    delegate :task_unaware_request, to: CmsRestApi
   end
 
 end

data/app/helpers/rails_connector/cms_tag_helper.rb

@@ -38,33 +38,41 @@ module RailsConnector
     #     <% end %>
     #
     # @api public
-    def cms_tag(tag_name, obj, field_name, options = {}, &block)
+    def cms_tag(tag_name, obj_or_widget, field_name, options = {}, &block)
       begin
-        field_type = obj.type_of_attribute(field_name.to_s)
+        field_type = obj_or_widget.type_of_attribute(field_name.to_s)
       rescue RailsConnectorError => e
         return content_tag(tag_name, '', options)
       end
 
-      options = options.merge({
-        'data-ip-private-field-id' => obj.id,
-        'data-ip-field-obj-class' => obj.obj_class,
-        'data-ip-field-name' => field_name,
-        'data-ip-field-type' => field_type,
-      }) if inplace_editing_allowed?
+      if inplace_editing_allowed?
+        options = options.merge({
+          'data-ip-field-name'      => field_name,
+          'data-ip-field-obj-class' => obj_or_widget.obj_class,
+          'data-ip-field-type'      => field_type,
+        })
+
+        if obj_or_widget.kind_of?(BasicWidget)
+          options['data-ip-private-field-id'] = obj_or_widget.obj.id
+          options['data-ip-private-field-widget-id'] = obj_or_widget.id
+        else
+          options['data-ip-private-field-id'] = obj_or_widget.id
+        end
+      end
 
       if field_type == 'widget'
-        rendered_widgets = obj.widgets(field_name).map do |widget|
-          render_widget(widget, obj, field_name, obj)
+        rendered_widgets = obj_or_widget.widgets(field_name).map do |widget|
+          render_widget(widget, obj_or_widget, field_name, obj_or_widget)
         end
         inner_html = safe_join(rendered_widgets)
       else
         if inplace_editing_allowed? && FIELD_TYPES_WITH_ORIGINAL_CONTENT.include?(field_type)
-          original_value = display_original_value(obj[field_name])
+          original_value = display_original_value(obj_or_widget[field_name])
           original_content = cms_tag_original_content(field_type, original_value)
           options['data-ip-private-field-original-content'] = MultiJson.encode(original_content)
         end
 
-        inner_html = block_given? ? capture { yield } : display_value(obj[field_name])
+        inner_html = block_given? ? capture { yield } : display_value(obj_or_widget[field_name])
       end
 
       if VOID_TAGS.include?(tag_name.to_s)

data/app/views/rails_connector/objs/show_widget.html.erb

@@ -0,0 +1 @@
+<%= render_widget(@widget, current_page, params[:field_name], @obj) %>

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector__Kris__dev__93/repos/cloud_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Thu Oct 24 14:57:22 2013 UTC
+## Converted at: Mon Nov 11 13:18:12 2013 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/config/locales/de.rails_connector.views.yml

@@ -4,6 +4,3 @@ de:
       errors:
         forbidden:
           no_permissions: "Sie haben nicht die notwendigen Zugriffsrechte"
-        gone:
-          not_released_anymore: "Die Datei war nur bis zum %{valid_until} veröffentlicht."
-          not_yet_released: "Die Datei wird erst am %{valid_from} veröffentlicht."

data/config/locales/en.rails_connector.views.yml

@@ -4,6 +4,3 @@ en:
       errors:
         forbidden:
           no_permissions: "You don't have the required permissions"
-        gone:
-          not_released_anymore: "The file was released only until %{valid_until}"
-          not_yet_released: "The file will be released on %{valid_from}"

data/config/routes.rb

@@ -1,9 +1,10 @@
 Rails.application.routes.draw do
   resources :objs, controller: 'rails_connector/objs', path: '__ipcms/objs',
-      only: [:show, :edit, :create, :update, :destroy] do
+      only: [:edit, :create, :update, :destroy] do
     get :page_class_selection, on: :collection
 
     member do
+      get :show_widget
       get :widget_class_selection
       post :create_widget
       get :edit_widget

data/lib/assets/javascripts/infopark_editing.js

@@ -7247,7 +7247,7 @@ $.i18n().load({
   'menu_bar.create_new_ws_confirmation_desc': 'Bitte geben Sie den Titel der neuen Arbeitskopie ein.',
   'menu_bar.create_new_ws_confirmation_placeholder': 'Neuer Titel',
 
-  'menu_bar_dropdown.edit_current_page': 'Diese Seite bearbeiten',
+  'menu_bar_dropdown.edit_current_page': 'Seiteneigenschaften',
   'menu_bar_dropdown.delete_current_page': 'Diese Seite löschen',
   'menu_bar_dropdown.save_current_page_to_clipboard': 'Diese Seite im Clipboard ablegen',
   'menu_bar_dropdown.duplicate_current_page': 'Diese Seite duplizieren',
@@ -7262,9 +7262,8 @@ $.i18n().load({
   'child_list_menus.copy_here': 'Seite im Clipboard hier einfügen',
 
   'widget_menus.add_widget': 'Widget einfügen',
-  'widget_menus.edit_widget': 'Widget bearbeiten',
+  'widget_menus.edit_widget': 'Widget-Eigenschaften',
   'widget_menus.delete_widget': 'Widget löschen',
-  'widget_menus.open_in_admin_gui': 'Im Admin-GUI öffnen',
 
   'commands.delete_obj.confirm_title': 'Wirklich diese Seite löschen?',
   'commands.delete_obj.confirm_description': 'Eine gelöschte Seite kann nicht wiederhergestellt werden.',
@@ -7332,7 +7331,7 @@ $.i18n().load({
   'menu_bar.create_new_ws_confirmation_desc': 'Please enter the title of the new working copy.',
   'menu_bar.create_new_ws_confirmation_placeholder': 'new title',
 
-  'menu_bar_dropdown.edit_current_page': 'Edit this page',
+  'menu_bar_dropdown.edit_current_page': 'Page properties',
   'menu_bar_dropdown.delete_current_page': 'Delete this page',
   'menu_bar_dropdown.save_current_page_to_clipboard': 'Place this page on the clipboard',
   'menu_bar_dropdown.duplicate_current_page': 'Duplicate this page',
@@ -7347,9 +7346,8 @@ $.i18n().load({
   'child_list_menus.copy_here': 'Copy page on clipboard here',
 
   'widget_menus.add_widget': 'Insert widget',
-  'widget_menus.edit_widget': 'Edit widget',
+  'widget_menus.edit_widget': 'Widget properties',
   'widget_menus.delete_widget': 'Delete widget',
-  'widget_menus.open_in_admin_gui': 'Open in admin GUI',
 
   'commands.delete_obj.confirm_title': 'Really delete this page?',
   'commands.delete_obj.confirm_description': 'A deleted page cannot be restored.',
@@ -8254,6 +8252,15 @@ $(function() {
             );
           },
 
+          widget: function() {
+            var widget_id = that.dom_element().attr('data-ip-private-field-widget-id');
+
+            if (widget_id) {
+              return infopark.widget.create_instance(that.obj(), widget_id,
+                  that.dom_element().attr('data-ip-private-widget-obj-class'));
+            }
+          },
+
           save: function(content) {
             if (content === undefined) {
               if (that.content) {
@@ -8265,7 +8272,13 @@ $(function() {
 
             var changes = {};
             changes[that.field_name()] = content;
-            return that.obj().save(changes);
+
+            var widget = that.widget();
+            if (widget) {
+              return that.widget().save(changes);
+            } else {
+              return that.obj().save(changes);
+            }
           },
 
           original_content: function() {
@@ -8489,6 +8502,43 @@ $(function() {
 
   infopark.cms_element.definitions.push(infopark.string_field_element);
 }());
+(function() {
+  $.extend(infopark, {
+    widget: {
+      create_instance: function(obj, id, widget_class_name) {
+        var that = {
+          id: function() {
+            return id;
+          },
+
+          obj: function() {
+            return obj;
+          },
+
+          widget_class_name: function() {
+            return widget_class_name;
+          },
+
+          save: function(widget_attributes) {
+            return that.obj().save(build_obj_attributes(widget_attributes));
+          },
+
+          destroy: function() {
+            return that.obj().save(build_obj_attributes(null));
+          }
+        };
+
+        var build_obj_attributes = function(widget_attributes) {
+          var obj_attributes = {_widget_pool: {}};
+          obj_attributes._widget_pool[that.id()] = widget_attributes;
+          return obj_attributes;
+        };
+
+        return that;
+      }
+    }
+  });
+}());
 (function() {
   $.extend(infopark, {
     widget_element: {
@@ -8497,12 +8547,13 @@ $(function() {
           var that = cms_element;
 
           $.extend(that, {
-            obj: function() {
-              return infopark.obj.create_instance(
+            widget: function() {
+              return infopark.widget.create_instance(that.widget_field().obj(),
                 that.dom_element().attr('data-ip-private-widget-id'),
                 that.dom_element().attr('data-ip-private-widget-obj-class')
               );
             },
+
             widget_field: function() {
               return infopark.cms_element.from_dom_element(that.dom_element().parent());
             },
@@ -8512,16 +8563,23 @@ $(function() {
             },
 
             fetch_edit_markup: function() {
-              return infopark.ajax('GET', 'objs/' +  that.obj().id() + '/edit_widget').then(function(data) {
+              var url = 'objs/' + that.widget().obj().id() + '/edit_widget?' + $.param({
+                widget_id: that.widget().id()
+              });
+
+              return infopark.ajax('GET', url).then(function(data) {
                 return data.markup;
               });
             },
 
             fetch_show_markup: function() {
-              return infopark.ajax('GET', 'objs/' + that.obj().id() + '?' + $.param({
+              var url = 'objs/' + that.widget().obj().id() + '/show_widget?' + $.param({
+                widget_id: that.widget().id(),
                 current_page_id: infopark.obj.current_page().id(),
                 field_name: that.field_name()
-              })).then(function(data) {
+              });
+
+              return infopark.ajax('GET', url).then(function(data) {
                 return data.markup;
               });
             },
@@ -8548,20 +8606,17 @@ $(function() {
 
           $.extend(that, {
             content: function() {
-              var widgets = that.widgets();
-              return {
-                layout: $.map(widgets, function(widget, index) {
-                  return { widget: widget.obj().id() };
-                })
-              };
+              return {list: _.map(that.widget_elements(), function(widget_element) {
+                return {widget: widget_element.widget().id()};
+              })};
             },
 
-            widgets: function() {
-              var widgets_dom = that.dom_element().children('[data-ip-private-widget-id]');
-              var widgets = _.map(widgets_dom, function(widget_dom) {
-                return infopark.cms_element.from_dom_element($(widget_dom));
+            widget_elements: function() {
+              var widget_elements_dom = that.dom_element().children('[data-ip-private-widget-id]');
+              var widget_elements = _.map(widget_elements_dom, function(widget_element_dom) {
+                return infopark.cms_element.from_dom_element($(widget_element_dom));
               });
-              return widgets;
+              return widget_elements;
             },
 
             create_widget: function(widget_class) {
@@ -9579,7 +9634,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
       },
 
       edit_widget: function(widget_element) {
-        var obj = widget_element.obj();
+        var widget = widget_element.widget();
         var dom_element = widget_element.dom_element();
 
         var has_changes = false;
@@ -9587,10 +9642,11 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
           has_changes = true;
         });
 
-        var title = obj.obj_class_name();
+        var title = widget.widget_class_name();
         var fetch_markup = function() {
           return widget_element.fetch_edit_markup();
         };
+
         return infopark.edit_dialog.open(title, fetch_markup).then(function() {
           infopark.write_monitor.off(token);
           if (has_changes) {
@@ -9607,10 +9663,11 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
           title: infopark.i18n.translate('commands.delete_widget.confirm_title'),
           description: infopark.i18n.translate('commands.delete_widget.confirm_description')
         }).then(function() {
+          var widget = widget_element.widget();
           widget_element.dom_element().remove();
 
           return widget_field_element.save().then(function() {
-            return widget_element.obj().destroy();
+            return widget.destroy();
           });
         });
       },
@@ -9647,7 +9704,7 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
         infopark.inplace_menus.define(function(menu) {
           if (infopark.editing.workspace().is_editable()) {
             _.each(infopark.widget_field_element.all(), function(widget_field_element) {
-              var widget_elements = widget_field_element.widgets();
+              var widget_elements = widget_field_element.widget_elements();
 
               if (widget_elements.length === 0) {
                 menu.add_item(widget_field_element.dom_element(), {
@@ -9685,14 +9742,6 @@ $(window).on('load', function () { infopark.inplace_menus.refresh_positions(); }
                     infopark.commands.delete_widget(widget_field_element, widget_element);
                   }
                 });
-
-                menu.add_item(widget_dom_element, {
-                  title: infopark.i18n.translate('widget_menus.open_in_admin_gui'),
-                  icon: '\uF000',
-                  execute: function() {
-                    infopark.commands.open_in_admin_gui(widget_element.obj().id());
-                  }
-                });
               });
             });
           }