effective_resources 1.0.14 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7b28e265ce6c4288365663aa0bfc56adce448a02
4
- data.tar.gz: 5ba116394c1a6a8d53c4f582a9a0118e99bfcbf8
3
+ metadata.gz: a7f245345d56b2f1156d7893ef64420d3886ceeb
4
+ data.tar.gz: 79ba04b4456309a2a3fefda39cd48a2f283813e6
5
5
  SHA512:
6
- metadata.gz: 8bad6d3fb3a9d7c0c69babbeea1d9a53d25bd448772ad848b3361f2116a37044f3245634daa67e423c9eed4feb14e92e0c7815c0796c97363609c64acd3eb4cc
7
- data.tar.gz: bafc5d5b585e8f1a9bfd02e7333313ad97f9cba5de1843e56aa59e76d58b850dca88f875dbb5ddf23435c2bc013394000bcdacec095f94b911ba21c376bf8f7f
6
+ metadata.gz: da328e8c107bc31b97653dfff3c2262c52e5ac5b293b497ef532ca98eb1c15ce9d5b39a57959df9bb5cf2eb7123989f15057d00a75929293baada22144804d82
7
+ data.tar.gz: ee21b637796f82782d7e45748cab6aad26ee347c84f790b9ccaf3db48db7c8a3a7b04afcd328647498e73a28463e8174256d1226ccd47a673b6bc4d0cee36167
@@ -49,8 +49,11 @@ module Effective
49
49
  when :update
50
50
  format.html { render :edit }
51
51
  when :destroy
52
- flash[:danger] = flash.now.delete(:danger)
53
- format.html { redirect_to(resource_redirect_path(action)) }
52
+ format.html do
53
+ flash.now[:danger] = nil
54
+ flash[:danger] = resource_flash(:danger, resource, action)
55
+ redirect_to(resource_redirect_path(action))
56
+ end
54
57
  else # member action
55
58
  format.html do
56
59
  if lookup_context.template_exists?(action, _prefixes)
@@ -67,20 +70,17 @@ module Effective
67
70
  render :show
68
71
  else
69
72
  @page_title ||= resource.to_s
70
- flash[:danger] = flash.now.delete(:danger)
73
+ flash.now[:danger] = nil
74
+ flash[:danger] = resource_flash(:danger, resource, action)
75
+
71
76
  redirect_to(referer_redirect_path || resource_redirect_path(action))
72
77
  end
73
78
  end
74
79
  end
75
80
 
76
- # Javascript responder
77
- if action.to_sym == :destroy
78
- format.js { redirect_to(resource_redirect_path(action)) }
79
- else
80
- format.js do
81
- view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
82
- render(view, locals: { action: action }) #
83
- end
81
+ format.js do
82
+ view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
83
+ render(view, locals: { action: action }) # action.js.erb
84
84
  end
85
85
 
86
86
  end
@@ -1 +1,4 @@
1
+ EffectiveForm.remote_form_payload = '';
2
+ EffectiveForm.remote_form_flash = <%= raw flash.to_json %>;
3
+
1
4
  EffectiveForm.finishDelete();
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '1.0.14'.freeze
2
+ VERSION = '1.0.15'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_resources
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.14
4
+ version: 1.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-11-30 00:00:00.000000000 Z
11
+ date: 2018-12-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails