infopark_fiona7 0.71.1.12 → 1.1.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4022da75c9cc31358e96b0c7acc02a2f600f076
-  data.tar.gz: 5f460a2ca0c1f02f0ff54949c11f04a1ea3ba6a6
+  metadata.gz: 300034555ee49868b2dad5e66fe59ad671403225
+  data.tar.gz: c2277f0fe2150975bb5473963e0f0953dcd579a4
 SHA512:
-  metadata.gz: 449f8ecefe2906fb1bc8581dad50753611914588e6108a9f38447d1e502012b5cab2f5939454bc440423b31873de3fb2819d4e72d15f922d85240ac9734d3ad8
-  data.tar.gz: a703033b66e872469499468fb1b3ccbb29169cdb4ad149e13fcc0b6458dace9815a9cd1087ba749eb2a81c4f07780f1c77cf2b4233753daf07a8aab0c7087b10
+  metadata.gz: f613ce7c780241d0100b4674d751f50a8698979b512b8dfdd1b638cbfa59c41f4e24865784edd0db417768c0b23c62e4c3b70f17b9b31a1c8d1b7e7a564601fa
+  data.tar.gz: bfab39e9bfe82767fb45411f584478d6ad1a43667a1c7d7c1addaa76203ee27197bae9a7cd273103909c4da122dee60ce08c3037046e2b3e6cda0cb5f5524a3b

data/app/assets/javascripts/fiona7_ui.js

@@ -38,6 +38,63 @@
     });
   };
 
+  var open_release_dialog = function(obj_id) {
+    var base_url = window.location.protocol + '//' + window.location.host + '/__scrivito/';
+    var path = 'objs/' + obj_id + '/release/preview';
+
+    var deferred = $.Deferred();
+
+    $.ajax(base_url + path, {
+      type: 'GET',
+      dataType: 'html',
+      cache: false
+    }).then(
+      function(result, text_status, xhr) {
+        var view = $(result);
+
+        $('#scrivito_editing').append(view);
+
+        var accept = function() {
+          scrivito.dialog.close_with_transition(view);
+
+          var checkedObjs = view.find(':checked').map(function() {
+            return $(this).val();
+          }).get();
+
+          var comment = view.find('#release-comment').val();
+
+          deferred.resolve(checkedObjs, comment);
+          return false;
+        };
+
+        var cancel = function() {
+          scrivito.dialog.close_with_transition(view);
+          deferred.reject();
+          return false;
+        };
+
+        var expand = function() {
+          $(this).next().slideToggle();
+          return false;
+        };
+
+        view.find('.scrivito_accept').on('click', accept);
+        view.find('.scrivito_cancel').on('click', cancel);
+
+        view.find('.expanding').on('click', expand);
+
+        scrivito.dialog.open_and_center_with_transition(view).then(function() {
+          // view loaded
+        });
+
+        scrivito.with_dialog_behaviour(view, deferred, {enter: accept, escape: cancel});
+      },
+        function(xhr, text_status, error) {
+        });
+
+      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.',
@@ -176,6 +233,16 @@
         },
 
         execute: function() {
+          open_release_dialog(obj.id()).done(function(objIds, comment) {
+            scrivito.with_saving_overlay(scrivito.ajax('PUT', 'objs/release', {data: {objs: objIds, comment: comment}}).then(function() {
+              scrivito.reload();
+            }).fail(function(error) {
+              scrivito.alert_dialog(scrivito.t('commands.'+action+'_obj.failed'));
+            }));
+          });
+
+          return;
+
           /* TODO: implement permission check */
           open_confirmation_dialog(action, dialog_icons[action]).done(function(comment) {
             scrivito.with_saving_overlay(scrivito.ajax('PUT', 'objs/' + obj.id() + '/release?comment=' + (comment || "")).then(function() {

data/app/assets/stylesheets/fiona7_ui.css.scss

@@ -13,6 +13,35 @@ body > div.scrivito_topbar > div > div.scrivito_button_bar.scrivito_app.scrivito
   display: none;
 }
 
+.scrivito_modal_body {
+  .main_object {
+    margin: 10px 0;
+  }
+
+  .expanding {
+    cursor: pointer;
+    margin-top: 10px;
+
+    i.scrivito_icon {
+      font-size: 9px;
+      color: white;
+    }
+  }
+
+  .expandable.collapsed {
+    display: none;
+  }
+
+  .expandable {
+    margin: 3px 0;
+
+    input#release-comment {
+      margin: 3px 0 3px 12px;
+    }
+  }
+
+}
+
 /*
 .scrivito_input_new_ws_name, #scrivito_delete_workspace, #scrivito_rename_workspace, #scrivito_create_workspace, #scrivito_rebase_workspace, #scrivito_workspace_settings {
   display: none !important;

data/app/controllers/fiona7/release_controller.rb

@@ -1,100 +1,62 @@
 module Fiona7
   class ReleaseController < ActionController::Base
     def release
-      @releasable = Set.new
-      @errors = []
+      obj_ids = params[:objs]
+      comment = params[:comment]
+      errors  = []
 
-      @obj = WriteObj.find(params[:id])
+      if !obj_ids.empty?
+        main_obj = obj_ids.shift
 
-      recursively_find_objects(@releasable, @obj, Set.new)
-
-      @releasable.each do |obj|
-        if obj.really_edited?
-          carefully_release(@errors, obj)
+        carefully_release(errors, main_obj, comment)
+        obj_ids.each do |other_obj|
+          carefully_release(errors, other_obj)
         end
       end
 
-      # TODO: display errors
       render json: {}
     end
 
-    protected
-
-    def carefully_release(errors, obj)
-      obj.take
-      obj.release!
-    rescue => e
-      Rails.logger.error("Error occured when releasing #{@obj.id}: unable to release Object with ID #{obj.id} (#{obj.path} because: #{e.inspect}")
-
-      # TODO: translate
-      error = "Unable to release Object with ID #{obj.id} because: #{e.message}"
-      errors << error
-    end
-
-    def recursively_find_objects(set, obj, already_encountered)
-      # substract already_encountered to prevent loops
-      widgets_of_this_object = widgets(obj) - already_encountered
-      referenced_objects_of_this_object = referenced_objects(obj) - already_encountered
+    def preview
+      self.in_rtc_workspace do
+        @obj = WriteObj.find(params[:id])
 
-      already_encountered.merge(widgets_of_this_object)
-      already_encountered.merge(referenced_objects_of_this_object)
+        @recursive = Fiona7::RecursiveObjectFinder.new(@obj)
 
-      widgets_of_this_object.each do |widget|
-        recursively_find_objects(set, widget, already_encountered)
-      end
+        @images     = @recursive.images.select      {|o| o.really_edited? }
+        @downloads  = @recursive.downloads.select   {|o| o.really_edited? }
+        @referenced = @recursive.referenced.select  {|o| o.really_edited? }
+        @linked     = @recursive.linked.select      {|o| o.really_edited? }
 
-      referenced_objects_of_this_object.each do |referenced|
-        recursively_find_objects(set, referenced, already_encountered)
+        render "preview", layout: false
       end
-
-      set.merge(widgets_of_this_object)
-      set.merge(referenced_objects_of_this_object)
-      set << obj
-
-      set
     end
 
-    def widgets(obj)
-      links = @obj[:X_widget_pool] || []
-      WriteObj.where(obj_id: links.map {|l| l.destination_object_id }).to_a.to_set
+    protected
+    def in_rtc_workspace(&block)
+      Scrivito::Workspace.find('rtc').as_current(&block)
     end
 
-    def referenced_objects(obj)
-      referenced = Set.new
-
-      type_definition = Fiona7::TypeRegister.instance.read_mangled(obj.obj_class)
-      type_definition.attrs.each do |attribute|
-        if attribute.type == :reference || attribute.type == :referencelist && attribute.name != "child_order"
-          (obj[attribute.real_name] || []).each do |link|
-            if link.internal?
-              destination_object = link.destination_object
-              if destination_object && (destination_object.image? || destination_object.generic?)
-                referenced << link.destination_object
-              end
-            end
-          end
-        elsif attribute.type == :link || attribute.type == :linklist 
-          (obj[attribute.real_name] || []).each do |link|
-            if link.internal?
-              destination_object = link.destination_object
-              if destination_object && (destination_object.image? || destination_object.generic?)
-                referenced << link.destination_object
-              end
-            end
-          end
-        end
-      end
+    def carefully_release(errors, obj, comment=nil)
+      obj.take
+      obj.release!(comment)
 
-      obj.text_links.each do |link|
-        if link.internal?
-          destination_object = link.destination_object
-          if destination_object && (destination_object.image? || destination_object.generic?)
-            referenced << link.destination_object
-          end
-        end
+      complex_object = Fiona7::ComplexObject.new(obj)
+      complex_object.widgets.each do |widget_obj|
+        widget_obj.take
+        widget_obj.release!(comment)
       end
+      #complex_object.binaries.each do |widget_obj|
+      #  widget_obj.take
+      #  widget_obj.release!(comment)
+      #end
+    rescue => e
+      Rails.logger.error("Error occured when releasing #{@obj.id}: unable to release Object with ID #{obj.id} (#{obj.path} because: #{e.inspect}")
 
-      referenced
+      # TODO: translate
+      error = "Unable to release Object with ID #{obj.id} because: #{e.message}"
+      errors << error
     end
+
   end
 end

data/app/controllers/scrivito/cms_dispatch_controller.rb

@@ -8,17 +8,8 @@ module Scrivito
     def process(action)
       CmsEnv.new(env).load
 
-      if !obj_not_found? && action == 'legacy'
-        if Scrivito::Configuration.legacy_routing
-          action = 'index'
-        else
-          redirect_to scrivito_path(loaded_obj), status: :moved_permanently
-          return self.response
-        end
-      end
-
       if obj_not_found? && editing_context.workspace_changed?
-        redirect_to :scrivito_root
+        redirect_to "/"
         return self.response
       end
 
@@ -53,7 +44,7 @@ module Scrivito
       return default_controller if obj_not_found?
       controller = "#{loaded_obj.controller_name}Controller".constantize
 
-      if controller.respond_to?(:use_for_obj_dispatch?) && controller.use_for_obj_dispatch? && controller.include?(Scrivito::ControllerActions)
+      if controller.respond_to?(:use_for_obj_dispatch?) && controller.use_for_obj_dispatch? 
         controller
       else
         default_controller
@@ -70,7 +61,6 @@ module Scrivito
       loaded_obj.is_a?(StandardError)
     end
 
-    # support DefaultScrivitoCmsController!
     def default_controller
       return Fiona7::DefaultScrivitoCmsController if Fiona7.mode == :legacy
       CmsController

data/app/controllers/scrivito/objs_controller.rb

@@ -35,8 +35,12 @@ module Scrivito
       params_parser = ObjCreateParamsParser.new(request.host, request.port)
       @obj = Obj.create(params_parser.parse(params[:obj]), scrivito_user: scrivito_user)
       render :obj
-    rescue ObjClassNotFound
-      head :not_found
+    rescue ObjClassNotFound => e
+      raise ClientError.new(
+        "You've tried to create a CMS object based on the \"#{e.message}\" class, which is "\
+        "either missing or not suitable for the object.",
+        400
+      )
     end
 
     def details
@@ -48,14 +52,12 @@ module Scrivito
       params_parser = ObjUpdateParamsParser.new(request.host, request.port,
         current_obj: current_obj, scrivito_user: scrivito_user)
       current_obj.update(params_parser.parse(params[:obj]))
-    rescue ObjClassNotFound
-      head :not_found
     end
 
     def destroy
       in_selected_workspace do
         parent = current_obj.parent
-        @redirect_to = parent ? scrivito_path(parent) : scrivito_root_path
+        @redirect_to = parent ? scrivito_path(parent) : "/"
         current_obj.destroy
       end
     end
@@ -85,17 +87,22 @@ module Scrivito
       render_empty_json
     end
 
-    # optimized away
     def conflicting_workspaces
       @workspaces = []
       render :workspaces
     end
 
-    # optimized away
     def is_outdated
       @is_outdated = false
     end
 
+    def binary_no_cache
+      in_selected_workspace do
+        binary = current_obj[params[:attribute_name]]
+        @no_cache_url = binary.no_cache_url
+      end
+    end
+
     def mark_resolved
       in_selected_workspace { current_obj.mark_resolved }
       render_empty_json
@@ -106,8 +113,20 @@ module Scrivito
       render :obj
     end
 
-    # optimized away
     def transfer_modifications
+      in_selected_workspace do
+        begin
+          obj = Obj.find_including_deleted(params[:id])
+          workspace = Workspace.find(params[:workspace_id])
+          authorize_workspace_access(:write, workspace) do
+            obj.transfer_modifications_to(workspace)
+          end
+        rescue TransferModificationsModifiedError
+          @error_reason = :modified
+        rescue TransferModificationsConflictError
+          @error_reason = :conflict
+        end
+      end
     end
 
     def duplicate
@@ -135,12 +154,21 @@ module Scrivito
         @enumerator = ObjSearchBuilder.new(@query).build
 
         if params[:query_action] == 'size'
-          render :search_only_size
-        elsif @formatter = fetch_formatter(@query[:format])
-          render :search
-        else
-          render :format_missing_error, status: :not_found
+          return render action: 'search/size'
+        end
+
+        unless @formatter = fetch_formatter(@query[:format])
+          return render action: 'search/missing_formatter', status: :not_found
         end
+
+        if facet_params = params[:facet]
+          attribute, options = MultiJson.decode(facet_params).values_at('attribute', 'options')
+          @facets = @enumerator.facet(attribute, options || {})
+          return render action: 'search/facet'
+        end
+
+        @batch = @enumerator.fetch_batch(params[:continuation])
+        render :search
       end
     end
 

data/app/controllers/scrivito/webservice_controller.rb

@@ -1,9 +1,10 @@
 module Scrivito
 
 class WebserviceController < ActionController::Base
-  rescue_from ClientError do |exception|
-    @exception = exception
-    render 'scrivito/webservice/error', formats: :json, status: exception.http_code
+  rescue_from ApplicationError, ClientError, ResourceNotFound do |error|
+    @error = error
+    @timestamp = Time.zone.now
+    render 'scrivito/webservice/error', formats: :json, status: error.http_code
   end
 
   before_filter :merge_correctly_parsed_json_params

data/app/views/fiona7/release/preview.html.erb

@@ -0,0 +1,73 @@
+<div class="scrivito_prompt_dialog scrivito_center_dialog scrivito_modal_prompt     scrivito_green scrivito_show" style="margin-left: -250px; margin-top: -165px; left: 50%;">
+  <div class="scrivito_modal_header">
+    <i class="scrivito_icon"></i>
+    <h3 class="scrivito_title">Änderungen an dieser Seite veröffentlichen?</h3>
+
+    <p class="scrivito_description">Eine Arbeitsversion zu veröffentlichen ist endgültig. Dieser Vorgang kann nicht rückgängig gemacht werden.</p>
+
+  </div>
+  <div class="scrivito_modal_body">
+    <div class="main_object">
+      <label class=""><input type="checkbox" value="<%= @obj.id %>" name="checked" checked="checked" disabled="disabled"> <%= @obj.title.presence || @obj.path %> (<%= @obj.obj_class %>)</label>
+    </div>
+
+    <% if !@images.empty? %>
+      <div class="expanding">
+        <span><i class="scrivito_icon"></i> Bilder</span>
+      </div>
+      <div class="expandable collapsed">
+        <% @images.each do |obj| %>
+          <label class=""><input type="checkbox" value="<%= obj.id %>" name="obj<%= obj.id %>" checked="checked"> <%= obj.title.presence || obj.path %> (<%= obj.obj_class %>)</label>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% if !@downloads.empty? %>
+      <div class="expanding">
+        <span><i class="scrivito_icon"></i> Downloads</span>
+      </div>
+      <div class="expandable collapsed">
+        <% @downloads.each do |obj| %>
+          <label class=""><input type="checkbox" value="<%= obj.id %>" name="obj<%= obj.id %>" checked="checked"> <%= obj.title.presence || obj.path %> (<%= obj.obj_class %>)</label>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% if !@referenced.empty? %>
+      <div class="expanding">
+        <span><i class="scrivito_icon"></i> Referenzierte Seiten</span>
+      </div>
+      <div class="expandable collapsed">
+        <% @referenced.each do |obj| %>
+          <label class=""><input type="checkbox" value="<%= obj.id %>" name="obj<%= obj.id %>"> <%= obj.title.presence || obj.path %> (<%= obj.obj_class %>)</label>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% if !@linked.empty? %>
+      <div class="expanding">
+        <span><i class="scrivito_icon"></i> Verlinkte Seiten</span>
+      </div>
+      <div class="expandable collapsed">
+        <% @linked.each do |obj| %>
+          <label class=""><input type="checkbox" value="<%= obj.id %>" name="obj<%= obj.id %>"> <%= obj.title.presence || obj.path %> (<%= obj.obj_class %>)</label>
+        <% end %>
+      </div>
+    <% end %>
+
+    <div class="expanding">
+      <span><i class="scrivito_icon"></i> Kommentar</span>
+    </div>
+    <div class="expandable collapsed">
+      <input type="text" id="release-comment" placeholder="Kommentar (optional)">
+    </div>
+  </div>
+  <div class="scrivito_modal_footer">
+    <a href="#" class="scrivito_button scrivito_ scrivito_cancel">
+      Abbrechen
+    </a>
+    <a href="#" class="scrivito_button scrivito_green scrivito_accept">
+      Freigeben
+    </a>
+  </div>
+</div>