rails_admin_aasm 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f0258a26ab4e94c799cf5bdd3e06d6fe93a9b7a
-  data.tar.gz: 2a54695acf0554904776e4ec6703dfe7c2fc7507
+  metadata.gz: 0d7bccd6715c77f64201d027fb10a9a2a76ebef4
+  data.tar.gz: 9f1ceaecd2a72edd535c1a3aa9cfa5f44757b0a2
 SHA512:
-  metadata.gz: 3ccb94cabc833983c580a23c18606931c2239f9a67ac69398cf903de6c6fec13916f97a4ec253ab101ec27146a71302f310ecab94d2d04342672b5f385dc2486
-  data.tar.gz: de3b3f26ba7114f0f78cde1b7506d6ed43275aa486a1391d18183945c68d86ebab510f98a910d6f46b92ad4e23a3f6dbd42c0d1005d35e4c95db4cbcec8c5b51
+  metadata.gz: 64b4e1ae753457c7268710041192d56ba2266a5010c6bdb784c455c7073faf765ad3eefc85f9915d972ddd374544b6bd942e5dd49539bf3e58b6edf8edcb95db
+  data.tar.gz: b04b9bd8755f83559eaac4d1d92c6fa9f6332822153f9961493d5c26564f1c275b18b0a80976673a2b5e650c809cfbb4083f62ec4069ee1eb7f07772d6c5639c

data/README.md

@@ -11,6 +11,7 @@ Since state_machine currently is not maintained, I turn to AASM https://github.c
 
 Add this line to your application's Gemfile:
 
+    #please use `0.1.1` if rails_admin <= `0.8.1`
     gem 'rails_admin_aasm'
 
 And then execute:
@@ -63,7 +64,7 @@ Mark the field you need display as state:
     end
 
 Some classes are preset by default (published, deleted, etc)
-  
+
 ### CanCan integration
 
     cannot :manage, Recipes::Recipe
@@ -88,7 +89,7 @@ State:
 
 ```
 product_order:
-    status/unpaid: 未支付 
+    status/unpaid: 未支付
 ```
 
 notice the state must combine with `/`, see: [https://github.com/aasm/aasm/issues/38](https://github.com/aasm/aasm/issues/38)

data/lib/rails_admin_aasm/action.rb

@@ -30,7 +30,7 @@ module RailsAdmin
                 raise 'event disabled' if @state_machine_options.disabled?(params[:event].to_sym)
                 # if @object.send("fire_#{params[:attr]}_event".to_sym, params[:event].to_sym)
                 if @object.send("may_#{params[:event]}?".to_sym)
-                  @object.send("#{params[:event]}!")
+                  @object.send("#{params[:event]}")
                   flash[:success] = I18n.t('admin.state_machine.event_fired', attr: params[:method], event: params[:event])
                 else
                   flash[:error] = obj.errors.full_messages.join(', ')
@@ -42,7 +42,7 @@ module RailsAdmin
             else
               flash[:error] = I18n.t('admin.state_machine.no_id')
             end
-            redirect_to :back
+            redirect_to back_or_index
           end
         end
 

data/lib/rails_admin_aasm/field.rb

@@ -64,15 +64,19 @@ module RailsAdmin
                 	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
                 event_class = @state_machine_options.event(event)
-                ret << bindings[:view].link_to(
-                  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}",
-                  style: 'margin-bottom: 5px;'
-                )
+                if bindings[:object].id.nil?
+                  ret
+                else
+                  ret << bindings[:view].link_to(
+                    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}",
+                    style: 'margin-bottom: 5px;'
+                  )
+                end
               end
             end
 

data/lib/rails_admin_aasm/version.rb

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

data/rails_admin_aasm.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails_admin"
-  spec.add_dependency "aasm"
+  spec.add_dependency 'rails_admin', '~> 1.0', '>= 1.0.0'
+  spec.add_dependency 'aasm'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_aasm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Chuanpin Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Integrate aasm with rails_admin, add a new type into rails_admin, which is