rails_admin_aasm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 292e20be1205943ead02dca1847d9d4baecbe5f0
-  data.tar.gz: 50867ec295a8820b34a55f0dbe43cb2c42260b31
+  metadata.gz: 6f0258a26ab4e94c799cf5bdd3e06d6fe93a9b7a
+  data.tar.gz: 2a54695acf0554904776e4ec6703dfe7c2fc7507
 SHA512:
-  metadata.gz: 6db327953fc6657a657fad8960a8ac195ac512c69025958752ce0a8dbb95fcf9c69f7fabac7db557e1768a95ea81e37fa6862a2cfca42c4685c2e3e02d385384
-  data.tar.gz: f7b7fe69382e99da006f175075df1634c32cb6227d8f869681e172b8dcf974b4beacd366a0a11f00e7b46c70119fbb7416e45cadbfbc3d0ff59eaeb27aa41684
+  metadata.gz: 3ccb94cabc833983c580a23c18606931c2239f9a67ac69398cf903de6c6fec13916f97a4ec253ab101ec27146a71302f310ecab94d2d04342672b5f385dc2486
+  data.tar.gz: de3b3f26ba7114f0f78cde1b7506d6ed43275aa486a1391d18183945c68d86ebab510f98a910d6f46b92ad4e23a3f6dbd42c0d1005d35e4c95db4cbcec8c5b51

data/README.md

@@ -73,6 +73,25 @@ Some classes are preset by default (published, deleted, etc)
 
 ### i18n (state and event names):
 
+Events:
+
+```
+activerecord:
+    events:
+      product_order:
+        pay: 支付
+        refund: 同意退款
+        reject_refund: 拒绝退款
+```
+
+State:
+
+```
+product_order:
+    status/unpaid: 未支付 
+```
+
+notice the state must combine with `/`, see: [https://github.com/aasm/aasm/issues/38](https://github.com/aasm/aasm/issues/38)
 
 ## Contributing
 

data/app/views/rails_admin/main/_form_state.html.haml

@@ -1,5 +1,5 @@
 .state-widget
-  = form.hidden_field field.method_name.to_s + '_event'
+  = form.hidden_field field.method_name.to_s
   = field.form_value
   :javascript
     $(function() {

data/lib/rails_admin_aasm/field.rb

@@ -29,7 +29,7 @@ module RailsAdmin
                 end
                 event_class = @state_machine_options.event(event)
                 ret << bindings[:view].link_to(
-                  event.to_s.humanize,
+                  bindings[:object].class.aasm.human_event_name(event),
                   state_path(model_name: @abstract_model, id: bindings[:object].id, event: event, attr: name),
                   method: :post,
                   class: "btn btn-mini btn-xs #{event_class}",
@@ -56,7 +56,6 @@ module RailsAdmin
               '<div style="height: 10px;"></div>'
             ]
 
-            empty = true
             unless read_only
               bindings[:object].aasm(state_machine_name).events.map(&:name).each do |event|
                 next if @state_machine_options.disabled?(event) || !bindings[:object].send("may_#{event}?")
@@ -64,11 +63,11 @@ module RailsAdmin
                 	adapter = bindings[:controller].authorization_adapter
                 	next unless (adapter.authorized?(:state, @abstract_model, bindings[:object]) && (adapter.authorized?(:all_events, @abstract_model, bindings[:object]) || adapter.authorized?(event, @abstract_model, bindings[:object])))
                 end
-                empty = false
                 event_class = @state_machine_options.event(event)
                 ret << bindings[:view].link_to(
-                  event.to_s.humanize,
-                  '#',
+                  bindings[:object].class.aasm.human_event_name(event),
+                  state_path(model_name: @abstract_model, id: bindings[:object].id, event: event, attr: name),
+                  method: :post,
                   'data-attr' => name,
                   'data-event' => event,
                   class: "state-btn btn btn-mini btn-xs #{event_class}",
@@ -77,16 +76,6 @@ module RailsAdmin
               end
             end
 
-            unless empty
-              ret << bindings[:view].link_to(
-                I18n.t('admin.state_machine.no_event'),
-                '#',
-                'data-attr' => name,
-                'data-event' => '',
-                class: "state-btn btn btn-default btn-mini btn-xs active",
-                style: 'margin-bottom: 5px;'
-              )
-            end
             ('<div style="white-space: normal;">' + ret.join(' ') + '</div>').html_safe
           end
 

data/lib/rails_admin_aasm/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminAasm
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_aasm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chuanpin Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin