effective_resources 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b28e265ce6c4288365663aa0bfc56adce448a02
-  data.tar.gz: 5ba116394c1a6a8d53c4f582a9a0118e99bfcbf8
+  metadata.gz: a7f245345d56b2f1156d7893ef64420d3886ceeb
+  data.tar.gz: 79ba04b4456309a2a3fefda39cd48a2f283813e6
 SHA512:
-  metadata.gz: 8bad6d3fb3a9d7c0c69babbeea1d9a53d25bd448772ad848b3361f2116a37044f3245634daa67e423c9eed4feb14e92e0c7815c0796c97363609c64acd3eb4cc
-  data.tar.gz: bafc5d5b585e8f1a9bfd02e7333313ad97f9cba5de1843e56aa59e76d58b850dca88f875dbb5ddf23435c2bc013394000bcdacec095f94b911ba21c376bf8f7f
+  metadata.gz: da328e8c107bc31b97653dfff3c2262c52e5ac5b293b497ef532ca98eb1c15ce9d5b39a57959df9bb5cf2eb7123989f15057d00a75929293baada22144804d82
+  data.tar.gz: ee21b637796f82782d7e45748cab6aad26ee347c84f790b9ccaf3db48db7c8a3a7b04afcd328647498e73a28463e8174256d1226ccd47a673b6bc4d0cee36167

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

@@ -49,8 +49,11 @@ module Effective
         when :update
           format.html { render :edit }
         when :destroy
-          flash[:danger] = flash.now.delete(:danger)
-          format.html { redirect_to(resource_redirect_path(action)) }
+          format.html do
+            flash.now[:danger] = nil
+            flash[:danger] = resource_flash(:danger, resource, action)
+            redirect_to(resource_redirect_path(action))
+          end
         else # member action
           format.html do
             if lookup_context.template_exists?(action, _prefixes)
@@ -67,20 +70,17 @@ module Effective
               render :show
             else
               @page_title ||= resource.to_s
-              flash[:danger] = flash.now.delete(:danger)
+              flash.now[:danger] = nil
+              flash[:danger] = resource_flash(:danger, resource, action)
+
               redirect_to(referer_redirect_path || resource_redirect_path(action))
             end
           end
         end
 
-        # Javascript responder
-        if action.to_sym == :destroy
-          format.js { redirect_to(resource_redirect_path(action)) }
-        else
-          format.js do
-            view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
-            render(view, locals: { action: action }) #
-          end
+        format.js do
+          view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
+          render(view, locals: { action: action }) # action.js.erb
         end
 
       end

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

@@ -1 +1,4 @@
+EffectiveForm.remote_form_payload = '';
+EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
+
 EffectiveForm.finishDelete();

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.14'.freeze
+  VERSION = '1.0.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails