effective_resources 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4fe2a46aac6809ee12c839f38125664f50ac64e
-  data.tar.gz: 4e022c5747750828080cc786ae1a1e5ce8474668
+  metadata.gz: b903d872e935f454fad70eb26bc2d355b5034785
+  data.tar.gz: d7620fe963d37d8b9e7ef5902084e36f45bfddff
 SHA512:
-  metadata.gz: 4c7cb536f94b69024d8af6e206f71a61c3eec482d53af71c713899e64d0f0ca079a85120f2c106ac9e68b956169f652ecfb35c15e57201195643f6ca01f9e1f6
-  data.tar.gz: 2fe867ec72221295e0570877c177f67b7f5e33d45d5919eca94578fe3e0c5fd604accec60c7a9a527ca2e023b9121a3b086cb11823310f2754b4085566a469b6
+  metadata.gz: e7d794194d53f98734483054b3e93a9bf8aedcae82fd430f7d32753bf2688325cabecadba0e0003dde127715b4d13a94e3016a5a95049dded9b9e7ccf920839e
+  data.tar.gz: c4c1b0472b1e2533ae686651ff673842f8d6229b95fcaa0711f1f4a7934d2ae23d3be5ac85a2b560e5361f67bd9c094decde00c8cdc53435ff197824b9d9abf4

data/app/controllers/concerns/effective/crud_controller.rb

@@ -191,10 +191,10 @@ module Effective
       self.resource ||= resource_scope.new
 
       @page_title ||= "New #{resource_name.titleize}"
-      EffectiveResources.authorize!(self, :create, resource)
 
       action = commit_action[:action]
       EffectiveResources.authorize!(self, action, resource) unless action == :save
+      EffectiveResources.authorize!(self, :create, resource) if action == :save
 
       resource.assign_attributes(send(resource_params_method_name))
       resource.created_by ||= current_user if resource.respond_to?(:created_by=)
@@ -236,10 +236,10 @@ module Effective
       self.resource ||= resource_scope.find(params[:id])
 
       @page_title = "Edit #{resource}"
-      EffectiveResources.authorize!(self, :update, resource)
 
       action = commit_action[:action]
       EffectiveResources.authorize!(self, action, resource) unless action == :save
+      EffectiveResources.authorize!(self, :update, resource) if action == :save
 
       resource.assign_attributes(send(resource_params_method_name))
 
@@ -248,7 +248,7 @@ module Effective
           flash[:success] ||= flash_success(resource, action)
 
           format.html { redirect_to(resource_redirect_path) }
-          format.js { } # update.js.erb
+          format.js { reload_resource } # update.js.erb
         else
           flash.now[:danger] ||= flash_danger(resource, action)
 
@@ -332,7 +332,10 @@ module Effective
 
       resource_klass.transaction do
         begin
-          resource.public_send("#{action}!") || raise("failed to #{action} #{resource}")
+          if resource.public_send("#{action}!") == false
+            raise("failed to #{action} #{resource}")
+          end
+
           yield if block_given?
           run_callbacks(:resource_save)
           return true
@@ -349,6 +352,10 @@ module Effective
       false
     end
 
+    def reload_resource
+      self.resource = resource_scope.find(params[:id])
+    end
+
     # Should return a new resource based on the passed one
     def duplicate_resource(resource)
       resource.dup

data/app/views/application/create.js.erb

@@ -3,7 +3,3 @@
 
 EffectiveBootstrap.remote_form_payload = $("<%= j render_resource_form(resource) %>");
 EffectiveBootstrap.remote_form_flash = <%= raw flash.to_json %>;
-
-<% if flash[:success].blank? %>
-  EffectiveBootstrap.remote_form_flash_payload = $("<%= j render('flash') %>");
-<% end %>

data/app/views/application/update.js.erb

@@ -3,7 +3,3 @@
 
 EffectiveBootstrap.remote_form_payload = $("<%= j render_resource_form(resource) %>");
 EffectiveBootstrap.remote_form_flash = <%= raw flash.to_json %>;
-
-<% if flash[:success].blank? %>
-  EffectiveBootstrap.remote_form_flash_payload = $("<%= j render('flash') %>");
-<% end %>

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.4'.freeze
+  VERSION = '0.8.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Code and Effect