infopark_fiona7 1.1.0.0.3 → 1.1.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e1fa4de2f2c2a04c38458c85453f4ec0392a00
-  data.tar.gz: 349f9e81560e27809f5c92f6b091a5648fa85e42
+  metadata.gz: 0e4faba12e3777d253526addb84018eccbd43d47
+  data.tar.gz: 3a977b389028604ec428e740d27817d8850c89fe
 SHA512:
-  metadata.gz: e6830670ae4b149c9f8e205f4f1b2d82e89ca820a43dc47c56dd945fb609e1384da6b45d2247eaa7b7a70633df43117e1cbcddfaa04aade179ac7316d36f70b3
-  data.tar.gz: 1d9fea097086ecfceb74caa058b41f784bf5ddee9cc740aad5d712b665581ad42d9609284d74c0f06aec8e682800dbf269426cad326af4843cb197e6524db106
+  metadata.gz: fa45a12ba6bf41a71a95297a5068b578e90350515e593cce94c374b855094634a5cc35029bb6cbb727db333e5b544ed2e9fd4017be19560ee74f3b85460ef169
+  data.tar.gz: 838319f5d92587be802dda0b0a73275e3dfce799a8ebfe55fcf1a1daadf65a6371f031ce05c0fd8d818ede2ae30ccb995fb6b76702a5dc29c94666368e627827

data/app/assets/javascripts/fiona7_ui.js

@@ -236,19 +236,6 @@
           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() {
-              scrivito.reload();
-            }).fail(function(error) {
-              scrivito.alert_dialog(scrivito.t('commands.'+action+'_obj.failed'));
             }));
           });
         }

data/app/controllers/fiona7/release_controller.rb

@@ -11,12 +11,18 @@ module Fiona7
 
         carefully_release(errors, main_obj, comment)
         objs.each do |other_obj|
-          carefully_release(errors, other_obj)
+          carefully_release(errors, other_obj, comment)
         end
       end
 
-    ensure
-      render json: {}
+      if errors.empty?
+        render json: {}
+      else
+        render json: {message: errors.join("\n"), message_for_editor: errors.join("\n")}, status: 412
+      end
+
+    rescue => e
+      render json: {message: e.message}, status: 500
     end
 
     def preview
@@ -41,12 +47,19 @@ module Fiona7
 
     def carefully_release(errors, obj, comment=nil)
       obj.take
-      obj.release!(comment)
+      obj.release!(comment) if obj.really_edited?
 
       complex_object = Fiona7::ComplexObject.new(obj)
       complex_object.widgets.each do |widget_obj|
-        widget_obj.take
-        widget_obj.release!(comment)
+        begin
+          widget_obj.take
+          widget_obj.release!(comment) if widget_obj.really_edited?
+        rescue => e
+          Rails.logger.error("Error occured when releasing #{obj.id}: unable to release Object with ID #{widget_obj.id} (#{widget_obj.path} because: #{e.inspect}")
+          # TODO: translate
+          error = "Unable to release Object with ID #{widget_obj.id} because: #{e.message}"
+          errors << error
+        end
       end
       #complex_object.binaries.each do |widget_obj|
       #  widget_obj.take

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.1.0.0.3"
+  VERSION = "1.1.0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0.3
+  version: 1.1.0.0.4
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails