effective_resources 0.6.2 → 0.6.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2c6c8584157e7ca3fe3e482ebd436d0906ebf046
4
- data.tar.gz: 1049673bbd0db8406d63b727ab1ee38872bffa18
3
+ metadata.gz: 060fa4ec7b7a834895eb20614d580d1bdd7ed0da
4
+ data.tar.gz: 23a2c6b34612eab663d670af3704e4fae6c56f8a
5
5
  SHA512:
6
- metadata.gz: 004e347369d61a273a34b2490f26d1485b4d7e2a86410ae056fcce395e49bd19a69b96f8ec0e9306f0f5b943f2e040ca8fed303e2e670c149d54e9072e6ff747
7
- data.tar.gz: f7da7f6816f54ea04a3e1881d3d801999b4f27a62bba592a17efdabc0686bfed52b37aa34073a19163d4bd5a0a2efed8612cd1c7adde35190878e5e747b6eaf2
6
+ metadata.gz: 052ba0b9bb23756a8562b2218174b769223076f9a5e78d3b59a1cf202f4e616cce988bb2924aa8a32b22ec1ab8b78dc05374bef019aa682c26c662cbeb5c24f8
7
+ data.tar.gz: e46b35c8bb32e8c5d47a52d7f1239e7d127c58a6c29457c99c203c5e0186cd973caec3df4f7ee8135b9550bcddb34ea490eed2c4afb3c30d4994416b89362a2d
@@ -43,7 +43,9 @@ module Effective
43
43
  raise "expected unless: to be callable. Try member_action :approve, 'Save and Approve', unless: -> { declined? }"
44
44
  end
45
45
 
46
- member_actions[commit] = (args || {}).merge(action: action)
46
+ redirect = args.delete(:redirect_to) || args.delete(:redirect) # Remove redirect_to keyword. use redirect.
47
+
48
+ member_actions[commit] = (args || {}).merge(action: action, redirect: redirect)
47
49
  end
48
50
 
49
51
  define_method(action) do
@@ -196,7 +198,8 @@ module Effective
196
198
  flash[:danger] ||= flash_danger(resource, :delete)
197
199
  end
198
200
 
199
- if referer_redirect_path && !request.referer.include?(resource_show_path)
201
+ # Make sure we didn't come from a member action that we no longer exist at
202
+ if referer_redirect_path && !request.referer.to_s.include?("/#{resource.to_param}/")
200
203
  redirect_to(referer_redirect_path)
201
204
  else
202
205
  redirect_to(resource_index_path)
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '0.6.2'.freeze
2
+ VERSION = '0.6.3'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_resources
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.2
4
+ version: 0.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect