rails_admin_aasm 0.1.0 → 0.1.1

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: 292e20be1205943ead02dca1847d9d4baecbe5f0
4
- data.tar.gz: 50867ec295a8820b34a55f0dbe43cb2c42260b31
3
+ metadata.gz: 6f0258a26ab4e94c799cf5bdd3e06d6fe93a9b7a
4
+ data.tar.gz: 2a54695acf0554904776e4ec6703dfe7c2fc7507
5
5
  SHA512:
6
- metadata.gz: 6db327953fc6657a657fad8960a8ac195ac512c69025958752ce0a8dbb95fcf9c69f7fabac7db557e1768a95ea81e37fa6862a2cfca42c4685c2e3e02d385384
7
- data.tar.gz: f7b7fe69382e99da006f175075df1634c32cb6227d8f869681e172b8dcf974b4beacd366a0a11f00e7b46c70119fbb7416e45cadbfbc3d0ff59eaeb27aa41684
6
+ metadata.gz: 3ccb94cabc833983c580a23c18606931c2239f9a67ac69398cf903de6c6fec13916f97a4ec253ab101ec27146a71302f310ecab94d2d04342672b5f385dc2486
7
+ data.tar.gz: de3b3f26ba7114f0f78cde1b7506d6ed43275aa486a1391d18183945c68d86ebab510f98a910d6f46b92ad4e23a3f6dbd42c0d1005d35e4c95db4cbcec8c5b51
data/README.md CHANGED
@@ -73,6 +73,25 @@ Some classes are preset by default (published, deleted, etc)
73
73
 
74
74
  ### i18n (state and event names):
75
75
 
76
+ Events:
77
+
78
+ ```
79
+ activerecord:
80
+ events:
81
+ product_order:
82
+ pay: 支付
83
+ refund: 同意退款
84
+ reject_refund: 拒绝退款
85
+ ```
86
+
87
+ State:
88
+
89
+ ```
90
+ product_order:
91
+ status/unpaid: 未支付
92
+ ```
93
+
94
+ notice the state must combine with `/`, see: [https://github.com/aasm/aasm/issues/38](https://github.com/aasm/aasm/issues/38)
76
95
 
77
96
  ## Contributing
78
97
 
@@ -1,5 +1,5 @@
1
1
  .state-widget
2
- = form.hidden_field field.method_name.to_s + '_event'
2
+ = form.hidden_field field.method_name.to_s
3
3
  = field.form_value
4
4
  :javascript
5
5
  $(function() {
@@ -29,7 +29,7 @@ module RailsAdmin
29
29
  end
30
30
  event_class = @state_machine_options.event(event)
31
31
  ret << bindings[:view].link_to(
32
- event.to_s.humanize,
32
+ bindings[:object].class.aasm.human_event_name(event),
33
33
  state_path(model_name: @abstract_model, id: bindings[:object].id, event: event, attr: name),
34
34
  method: :post,
35
35
  class: "btn btn-mini btn-xs #{event_class}",
@@ -56,7 +56,6 @@ module RailsAdmin
56
56
  '<div style="height: 10px;"></div>'
57
57
  ]
58
58
 
59
- empty = true
60
59
  unless read_only
61
60
  bindings[:object].aasm(state_machine_name).events.map(&:name).each do |event|
62
61
  next if @state_machine_options.disabled?(event) || !bindings[:object].send("may_#{event}?")
@@ -64,11 +63,11 @@ module RailsAdmin
64
63
  adapter = bindings[:controller].authorization_adapter
65
64
  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
65
  end
67
- empty = false
68
66
  event_class = @state_machine_options.event(event)
69
67
  ret << bindings[:view].link_to(
70
- event.to_s.humanize,
71
- '#',
68
+ bindings[:object].class.aasm.human_event_name(event),
69
+ state_path(model_name: @abstract_model, id: bindings[:object].id, event: event, attr: name),
70
+ method: :post,
72
71
  'data-attr' => name,
73
72
  'data-event' => event,
74
73
  class: "state-btn btn btn-mini btn-xs #{event_class}",
@@ -77,16 +76,6 @@ module RailsAdmin
77
76
  end
78
77
  end
79
78
 
80
- unless empty
81
- ret << bindings[:view].link_to(
82
- I18n.t('admin.state_machine.no_event'),
83
- '#',
84
- 'data-attr' => name,
85
- 'data-event' => '',
86
- class: "state-btn btn btn-default btn-mini btn-xs active",
87
- style: 'margin-bottom: 5px;'
88
- )
89
- end
90
79
  ('<div style="white-space: normal;">' + ret.join(' ') + '</div>').html_safe
91
80
  end
92
81
 
@@ -1,3 +1,3 @@
1
1
  module RailsAdminAasm
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  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.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chuanpin Zhu
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-05-09 00:00:00.000000000 Z
11
+ date: 2016-05-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails_admin