rails_admin_aasm 0.0.6 → 0.1.0
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 +4 -4
- data/lib/rails_admin_aasm/field.rb +15 -11
- data/lib/rails_admin_aasm/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 292e20be1205943ead02dca1847d9d4baecbe5f0
|
|
4
|
+
data.tar.gz: 50867ec295a8820b34a55f0dbe43cb2c42260b31
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6db327953fc6657a657fad8960a8ac195ac512c69025958752ce0a8dbb95fcf9c69f7fabac7db557e1768a95ea81e37fa6862a2cfca42c4685c2e3e02d385384
|
|
7
|
+
data.tar.gz: f7b7fe69382e99da006f175075df1634c32cb6227d8f869681e172b8dcf974b4beacd366a0a11f00e7b46c70119fbb7416e45cadbfbc3d0ff59eaeb27aa41684
|
|
@@ -16,14 +16,14 @@ module RailsAdmin
|
|
|
16
16
|
state = bindings[:object].send(name)
|
|
17
17
|
state_class = @state_machine_options.state(state)
|
|
18
18
|
ret = [
|
|
19
|
-
'<div class="label ' + state_class + '">' + bindings[:object].aasm.human_state + '</div>',
|
|
19
|
+
'<div class="label ' + state_class + '">' + bindings[:object].aasm(state_machine_name).human_state + '</div>',
|
|
20
20
|
'<div style="height: 10px;"></div>'
|
|
21
21
|
]
|
|
22
22
|
|
|
23
23
|
unless read_only
|
|
24
|
-
bindings[:object].aasm.events.map(&:name).each do |event|
|
|
24
|
+
bindings[:object].aasm(state_machine_name).events.map(&:name).each do |event|
|
|
25
25
|
next if @state_machine_options.disabled?(event) || !bindings[:object].send("may_#{event}?")
|
|
26
|
-
unless bindings[:controller].try(:authorization_adapter).nil?
|
|
26
|
+
unless bindings[:controller].try(:authorization_adapter).nil?
|
|
27
27
|
adapter = bindings[:controller].authorization_adapter
|
|
28
28
|
next unless (adapter.authorized?(:state, @abstract_model, bindings[:object]) && (adapter.authorized?(:all_events, @abstract_model, bindings[:object]) || adapter.authorized?(event, @abstract_model, bindings[:object])))
|
|
29
29
|
end
|
|
@@ -31,7 +31,7 @@ module RailsAdmin
|
|
|
31
31
|
ret << bindings[:view].link_to(
|
|
32
32
|
event.to_s.humanize,
|
|
33
33
|
state_path(model_name: @abstract_model, id: bindings[:object].id, event: event, attr: name),
|
|
34
|
-
method: :post,
|
|
34
|
+
method: :post,
|
|
35
35
|
class: "btn btn-mini btn-xs #{event_class}",
|
|
36
36
|
style: 'margin-bottom: 5px;'
|
|
37
37
|
)
|
|
@@ -52,15 +52,15 @@ module RailsAdmin
|
|
|
52
52
|
state = bindings[:object].send(name)
|
|
53
53
|
state_class = @state_machine_options.state(state)
|
|
54
54
|
ret = [
|
|
55
|
-
'<div class="label ' + state_class + '">' + bindings[:object].aasm.human_state + '</div>',
|
|
55
|
+
'<div class="label ' + state_class + '">' + bindings[:object].aasm(state_machine_name).human_state + '</div>',
|
|
56
56
|
'<div style="height: 10px;"></div>'
|
|
57
57
|
]
|
|
58
58
|
|
|
59
59
|
empty = true
|
|
60
60
|
unless read_only
|
|
61
|
-
bindings[:object].aasm.events.map(&:name).each do |event|
|
|
61
|
+
bindings[:object].aasm(state_machine_name).events.map(&:name).each do |event|
|
|
62
62
|
next if @state_machine_options.disabled?(event) || !bindings[:object].send("may_#{event}?")
|
|
63
|
-
unless bindings[:controller].try(:authorization_adapter).nil?
|
|
63
|
+
unless bindings[:controller].try(:authorization_adapter).nil?
|
|
64
64
|
adapter = bindings[:controller].authorization_adapter
|
|
65
65
|
next unless (adapter.authorized?(:state, @abstract_model, bindings[:object]) && (adapter.authorized?(:all_events, @abstract_model, bindings[:object]) || adapter.authorized?(event, @abstract_model, bindings[:object])))
|
|
66
66
|
end
|
|
@@ -76,7 +76,7 @@ module RailsAdmin
|
|
|
76
76
|
)
|
|
77
77
|
end
|
|
78
78
|
end
|
|
79
|
-
|
|
79
|
+
|
|
80
80
|
unless empty
|
|
81
81
|
ret << bindings[:view].link_to(
|
|
82
82
|
I18n.t('admin.state_machine.no_event'),
|
|
@@ -89,16 +89,16 @@ module RailsAdmin
|
|
|
89
89
|
end
|
|
90
90
|
('<div style="white-space: normal;">' + ret.join(' ') + '</div>').html_safe
|
|
91
91
|
end
|
|
92
|
-
|
|
92
|
+
|
|
93
93
|
register_instance_option :export_value do
|
|
94
94
|
state = bindings[:object].send(name)
|
|
95
|
-
bindings[:object].aasm.human_state
|
|
95
|
+
bindings[:object].aasm(state_machine_name).human_state
|
|
96
96
|
end
|
|
97
97
|
|
|
98
98
|
register_instance_option :partial do
|
|
99
99
|
:form_state
|
|
100
100
|
end
|
|
101
|
-
|
|
101
|
+
|
|
102
102
|
register_instance_option :read_only do
|
|
103
103
|
false
|
|
104
104
|
end
|
|
@@ -120,6 +120,10 @@ module RailsAdmin
|
|
|
120
120
|
end
|
|
121
121
|
end
|
|
122
122
|
end
|
|
123
|
+
|
|
124
|
+
register_instance_option :state_machine_name do
|
|
125
|
+
@state_machine_name || :default
|
|
126
|
+
end
|
|
123
127
|
end
|
|
124
128
|
end
|
|
125
129
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rails_admin_aasm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0
|
|
4
|
+
version: 0.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chuanpin Zhu
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2016-05-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails_admin
|
|
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
109
109
|
version: '0'
|
|
110
110
|
requirements: []
|
|
111
111
|
rubyforge_project:
|
|
112
|
-
rubygems_version: 2.4.
|
|
112
|
+
rubygems_version: 2.4.8
|
|
113
113
|
signing_key:
|
|
114
114
|
specification_version: 4
|
|
115
115
|
summary: Integrate aasm with rails_admin, add a new type into rails_admin, which is
|