effective_resources 1.18.3 → 1.18.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/concerns/effective/flash_messages.rb +2 -11
- data/app/controllers/concerns/effective/wizard_controller/before_actions.rb +5 -4
- data/app/controllers/concerns/effective/wizard_controller.rb +7 -1
- data/app/helpers/effective_resources_helper.rb +3 -0
- data/app/helpers/effective_resources_wizard_helper.rb +1 -1
- data/app/models/concerns/acts_as_wizard.rb +4 -0
- data/lib/effective_resources/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 62921f58ed6ed86c3dc1fc8f08b78509170185d28ca302e8edaac034aee13c3a
|
4
|
+
data.tar.gz: 984a86a6c60a73b257a771d3d805673c7d0ab2bc4b6009580fb81c25b6c0c10c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1209d346a9de8b331e2976578881b1308a12593ede050e2fb9964c10ccd9dbd24ec85ecc520d6d9e438589de4845692b162897967953f7c3076df54c9b43c631
|
7
|
+
data.tar.gz: ab56820215894af275fa99a4de2ba66b8a1fc05e1acf43167936a9674bd3330b50de5fb4f35bc5da63d505aff84794e8404c848e1ccef06f327c796f3c128db9
|
@@ -8,11 +8,7 @@ module Effective
|
|
8
8
|
def flash_success(resource, action = nil, name: nil)
|
9
9
|
raise 'expected an ActiveRecord resource' unless (name || resource.class.respond_to?(:model_name))
|
10
10
|
|
11
|
-
name ||=
|
12
|
-
resource_human_name
|
13
|
-
else
|
14
|
-
resource.to_s.presence || resource_human_name
|
15
|
-
end
|
11
|
+
name ||= resource_human_name
|
16
12
|
|
17
13
|
"Successfully #{action_verb(action)} #{name || 'resource'}".html_safe
|
18
14
|
end
|
@@ -25,12 +21,7 @@ module Effective
|
|
25
21
|
action = action.to_s.gsub('_', ' ')
|
26
22
|
|
27
23
|
messages = flash_errors(resource, e: e)
|
28
|
-
|
29
|
-
name ||= if resource.respond_to?(:destroyed?) && resource.destroyed?
|
30
|
-
resource_human_name
|
31
|
-
else
|
32
|
-
resource.to_s.presence || resource_human_name
|
33
|
-
end
|
24
|
+
name ||= resource_human_name
|
34
25
|
|
35
26
|
["Unable to #{action}", (" #{name}" if name), (": #{messages}" if messages)].compact.join.html_safe
|
36
27
|
end
|
@@ -21,6 +21,11 @@ module Effective
|
|
21
21
|
self.resource ||= find_wizard_resource
|
22
22
|
end
|
23
23
|
|
24
|
+
def assign_resource_current_user
|
25
|
+
return unless respond_to?(:current_user)
|
26
|
+
resource.current_user ||= current_user
|
27
|
+
end
|
28
|
+
|
24
29
|
# before_action :authorize_resource, only: [:show, :update]
|
25
30
|
# Authorize the resource
|
26
31
|
def authorize_resource
|
@@ -70,10 +75,6 @@ module Effective
|
|
70
75
|
# before_action :assign_current_step, only: [:show, :update]
|
71
76
|
# Assign the current step to resource
|
72
77
|
def assign_current_step
|
73
|
-
if respond_to?(:current_user) && resource.respond_to?(:current_user=)
|
74
|
-
resource.current_user = current_user
|
75
|
-
end
|
76
|
-
|
77
78
|
resource.current_step = step.to_sym
|
78
79
|
end
|
79
80
|
|
@@ -22,6 +22,8 @@ module Effective
|
|
22
22
|
before_action :redirect_if_blank_step
|
23
23
|
|
24
24
|
before_action :assign_resource
|
25
|
+
before_action :assign_resource_current_user
|
26
|
+
|
25
27
|
before_action :authorize_resource
|
26
28
|
before_action :assign_required_steps
|
27
29
|
|
@@ -59,10 +61,14 @@ module Effective
|
|
59
61
|
if params[resource_name_id] && params[resource_name_id] != 'new'
|
60
62
|
resource_scope.find(params[resource_name_id])
|
61
63
|
else
|
62
|
-
|
64
|
+
build_wizard_resource
|
63
65
|
end
|
64
66
|
end
|
65
67
|
|
68
|
+
def build_wizard_resource
|
69
|
+
resource_scope.new
|
70
|
+
end
|
71
|
+
|
66
72
|
def resource_wizard_step_title(resource, step)
|
67
73
|
return if step == 'wicked_finish'
|
68
74
|
resource.wizard_step_title(step)
|
@@ -6,7 +6,7 @@ module EffectiveResourcesWizardHelper
|
|
6
6
|
klasses = ['wizard-sidebar', 'list-group', ('list-group-horizontal' if horizontal)].compact.join(' ')
|
7
7
|
|
8
8
|
sidebar = content_tag(:div, class: klasses) do
|
9
|
-
resource.
|
9
|
+
resource.sidebar_steps.map.with_index do |nav_step, index|
|
10
10
|
render_wizard_sidebar_item(resource, nav_step, (index + 1 if numbers))
|
11
11
|
end.join.html_safe
|
12
12
|
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.18.
|
4
|
+
version: 1.18.6
|
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: 2022-07-
|
11
|
+
date: 2022-07-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|