rails_admin_aasm 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e2ce562b942d294aa102c3dcc99fc5277bf326
-  data.tar.gz: facd6f6c9b17d820ab62194eb9f77080c190ea5b
+  metadata.gz: 292e20be1205943ead02dca1847d9d4baecbe5f0
+  data.tar.gz: 50867ec295a8820b34a55f0dbe43cb2c42260b31
 SHA512:
-  metadata.gz: 39a46ae86404f3c5de1cbd578c85b43504118929cd737cfae5ceba091b7ae9ed632bdbbe2d9e8f7a5d516fcf67725a3cc37ad7579fe3eb7c0df6cb7d9739c191
-  data.tar.gz: e2d3105c00f95f93e0abe0e58a9f8909fcab5706f42d1edcfc4efc51e13b618961b118fb8cdbc7383e07bded227e77036add7dce8ae6b076403e2b44cd5fe39e
+  metadata.gz: 6db327953fc6657a657fad8960a8ac195ac512c69025958752ce0a8dbb95fcf9c69f7fabac7db557e1768a95ea81e37fa6862a2cfca42c4685c2e3e02d385384
+  data.tar.gz: f7b7fe69382e99da006f175075df1634c32cb6227d8f869681e172b8dcf974b4beacd366a0a11f00e7b46c70119fbb7416e45cadbfbc3d0ff59eaeb27aa41684

data/lib/rails_admin_aasm/field.rb

@@ -16,14 +16,14 @@ module RailsAdmin
             state = bindings[:object].send(name)
             state_class = @state_machine_options.state(state)
             ret = [
-              '<div class="label ' + state_class + '">' + bindings[:object].aasm.human_state + '</div>',
+              '<div class="label ' + state_class + '">' + bindings[:object].aasm(state_machine_name).human_state + '</div>',
               '<div style="height: 10px;"></div>'
             ]
 
             unless read_only
-              bindings[:object].aasm.events.map(&:name).each do |event|
+              bindings[:object].aasm(state_machine_name).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? 
+                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])))
                 end
@@ -31,7 +31,7 @@ module RailsAdmin
                 ret << bindings[:view].link_to(
                   event.to_s.humanize,
                   state_path(model_name: @abstract_model, id: bindings[:object].id, event: event, attr: name),
-                  method: :post, 
+                  method: :post,
                   class: "btn btn-mini btn-xs #{event_class}",
                   style: 'margin-bottom: 5px;'
                 )
@@ -52,15 +52,15 @@ module RailsAdmin
             state = bindings[:object].send(name)
             state_class = @state_machine_options.state(state)
             ret = [
-              '<div class="label ' + state_class + '">' + bindings[:object].aasm.human_state + '</div>',
+              '<div class="label ' + state_class + '">' + bindings[:object].aasm(state_machine_name).human_state + '</div>',
               '<div style="height: 10px;"></div>'
             ]
 
             empty = true
             unless read_only
-              bindings[:object].aasm.events.map(&:name).each do |event|
+              bindings[:object].aasm(state_machine_name).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? 
+                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])))
                 end
@@ -76,7 +76,7 @@ module RailsAdmin
                 )
               end
             end
-            
+
             unless empty
               ret << bindings[:view].link_to(
                 I18n.t('admin.state_machine.no_event'),
@@ -89,16 +89,16 @@ module RailsAdmin
             end
             ('<div style="white-space: normal;">' + ret.join(' ') + '</div>').html_safe
           end
-          
+
           register_instance_option :export_value do
             state = bindings[:object].send(name)
-            bindings[:object].aasm.human_state
+            bindings[:object].aasm(state_machine_name).human_state
           end
 
           register_instance_option :partial do
             :form_state
           end
-          
+
           register_instance_option :read_only do
             false
           end
@@ -120,6 +120,10 @@ module RailsAdmin
               end
             end
           end
+
+          register_instance_option :state_machine_name do
+            @state_machine_name || :default
+          end
         end
       end
     end

data/lib/rails_admin_aasm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_aasm
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Chuanpin Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Integrate aasm with rails_admin, add a new type into rails_admin, which is