rails_admin_state 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70f321c024aeac6a4221473e8a2593f910ff79dd
-  data.tar.gz: e34bf9fb9543c16cb3a956e0c7ed83f4b62505d1
+  metadata.gz: f20d3e07ff3d8c970ddaf76c901b52dfb13146da
+  data.tar.gz: d5cda2420ed4e07fc683f4322490a3c308b9a720
 SHA512:
-  metadata.gz: 2a604a9778980a1c1d91b060217751b89a753336d138564810e622645f974e49ccc7b6193887303f23429563675b6b07199f33bcb81bcc0d180c41ae4d8416c3
-  data.tar.gz: d81b038a026e7ab49bc0657bb1e33c1484a39f99669caaae493244c42beacb5c31f17cff45eaee743024dd677c2c014d21eeefff6210bfe02620035f46d53db1
+  metadata.gz: fbf712ba02f9ee462f48d7c4152ae0a98aa82b4accc25f4b90d5c26de9e973a93488fea9cdc7f2823748c8020efe444280352297f4bf5f465bbd27278078465f
+  data.tar.gz: e7d726614906b1239af6d8799fe9b21ef9c928d559b9c39739da8fbe82bda2773eca824d1c025beb4899659b7a070c741919d831ad7b3d3688ca398cb93d13ef

data/lib/rails_admin_state/configuration.rb

@@ -31,12 +31,12 @@ module RailsAdminState
 
     def state(name)
       return '' if name.nil?
-      options[:states][name.to_sym] || ''
+      options[:states][name.to_sym] || 'label-default'
     end
 
     def event(name)
       return '' if name.nil?
-      options[:events][name.to_sym] || ''
+      options[:events][name.to_sym] || 'btn-default'
     end
 
     def disabled?(name)

data/lib/rails_admin_state/field.rb

@@ -20,18 +20,20 @@ module RailsAdmin
               '<div class="label ' + state_class + '">' + s.human_name + '</div>',
               '<div style="height: 10px;"></div>'
             ]
-
             unless read_only
               events = bindings[:object].class.state_machines[name.to_sym].events
               bindings[:object].send("#{name}_events".to_sym).each do |event|
                 next if @state_machine_options.disabled?(event)
-                next unless v.authorized?(:state, @abstract_model, bindings[:object]) && (v.authorized?(:all_events, @abstract_model, bindings[:object]) || v.authorized?(event, @abstract_model, bindings[:object]))
+                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
                 event_class = @state_machine_options.event(event)
                 ret << bindings[:view].link_to(
                   events[event].human_name,
                   state_path(model_name: @abstract_model, id: bindings[:object].id, event: event, attr: name),
                   method: :post, 
-                  class: "btn btn-mini #{event_class}",
+                  class: "btn btn-mini btn-xs #{event_class}",
                   style: 'margin-bottom: 5px;'
                 )
               end
@@ -61,7 +63,10 @@ module RailsAdmin
               events = bindings[:object].class.state_machines[name.to_sym].events
               bindings[:object].send("#{name}_events".to_sym).each do |event|
                 next if @state_machine_options.disabled?(event)
-                next unless v.authorized?(:state, @abstract_model, bindings[:object]) && (v.authorized?(:all_events, @abstract_model, bindings[:object]) || v.authorized?(event, @abstract_model, bindings[:object]))
+                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
                 empty = false
                 event_class = @state_machine_options.event(event)
                 ret << bindings[:view].link_to(
@@ -69,7 +74,7 @@ module RailsAdmin
                   '#',
                   'data-attr' => name,
                   'data-event' => event,
-                  class: "state-btn btn btn-mini #{event_class}",
+                  class: "state-btn btn btn-mini btn-xs #{event_class}",
                   style: 'margin-bottom: 5px;'
                 )
               end
@@ -80,7 +85,7 @@ module RailsAdmin
                 '#',
                 'data-attr' => name,
                 'data-event' => '',
-                class: "state-btn btn btn-mini active",
+                class: "state-btn btn btn-default btn-mini btn-xs active",
                 style: 'margin-bottom: 5px;'
               )
             end
@@ -96,6 +101,10 @@ module RailsAdmin
             :form_state
           end
 
+          register_instance_option :read_only do
+            false
+          end
+
           register_instance_option :allowed_methods do
             [method_name, (method_name.to_s + '_event').to_sym]
           end

data/lib/rails_admin_state/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminState
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_state
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin