rails_admin_aasm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a9b8d66a5b55bd0d0780c4514c10755ba230ea
-  data.tar.gz: dc26971f157c056d5e472bf16accf528e78d30e1
+  metadata.gz: db83f4151fab080632aeae76e29e28daf407500f
+  data.tar.gz: fb8bc60042e40b0bf191ba3654eb53895b4ea861
 SHA512:
-  metadata.gz: 4d58d096f34dcf07e92dfb445533e973bb970e6f86a712f98ae79d6bc62b432ebef70a9287abd807eabcad45fd5ae155409bb7953c03e5b49dde64652e13dcd3
-  data.tar.gz: d41815168c60a971ce84126a70734958429aa7daaf01e546ab696befbc703733c47971f784ddeba1a24e275becac0ccd8b0b71ad44b263c8cfbab79954a1870f
+  metadata.gz: f475949aa9051a9686630bfdd604418e42c551fa37ff9c50623a2b57939ecb55255db1230367c031dbea0319df8474049d76f12fb2fec359706afe26b5485869
+  data.tar.gz: 65c0164c2e679572488226a3d1c452fe4f860761dc4d6a12aa2241bf5545121bfe874200e0e87ef9594e9482fa1ca335264a5e9b4283370569a5539b96c5f1cf

data/lib/rails_admin_aasm/field.rb

@@ -21,9 +21,8 @@ module RailsAdmin
             ]
 
             unless read_only
-              bindings[:object].aasm.events.each do |event|
-                event = event.name
-                next if @state_machine_options.disabled?(event)
+              bindings[:object].aasm.events.map(&:name).each do |event|
+                next if @state_machine_options.disabled?(event) || !bindings[:object].send("may_#{event}?")
                 unless bindings[:controller].try(:authorization_adapter).nil? 
                   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])))
@@ -59,9 +58,8 @@ module RailsAdmin
 
             empty = true
             unless read_only
-              bindings[:object].aasm.events.each do |event|
-                event = event.name
-                next if @state_machine_options.disabled?(event)
+              bindings[:object].aasm.events.map(&:name).each do |event|
+                next if @state_machine_options.disabled?(event) || !bindings[:object].send("may_#{event}?")
                 unless bindings[:controller].try(:authorization_adapter).nil? 
                 	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])))

data/lib/rails_admin_aasm/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminAasm
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_aasm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Chuanpin Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin