rails_admin_state 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d212ee119619ef85b445d0c25598d3a0e80b747
-  data.tar.gz: 1b0e5d57c8db6ad968e19c914a29c32a5e8c8882
+  metadata.gz: 6e934a56df4a247bf6057a76e6950dba086438dc
+  data.tar.gz: 097c47d5b172b100053bfc6f779ddba75efdc79e
 SHA512:
-  metadata.gz: 1a7cf527ca9611cba7896a5ec60e965d8049f6e8c192ab1bc0c45ae81330f3a91c5725c5886365323fe0241c034d084e917929a562bc01f5339cd7eb047a1c92
-  data.tar.gz: c459ce5dd783bc94d858ccf699e31f0784ba23f4c890bf85c88822b680fd2630f75940ad88152a625d52e32d5919d52893736524749592aab3c842bd695674f6
+  metadata.gz: 2f0fa99675c1349e4119537dba9bf2e8d3f3d526bb3e53dd4034f319da899f60a50e6b3831ed1b92441a6cb72b5a155bbebeaa6885f342a553093bbc69729b8b
+  data.tar.gz: 013b0afe86097e5bf610bcb34ad1e026437584b04dfb485a239fbcb52071b8ad224448edaefd5f2bf7081fa04f38e952ce9f99a82ea4632b6d1e1a40c4d81b38

data/README.md

@@ -66,6 +66,13 @@ Mark the field you need display as state:
 
 Some classes are preset by default (published, deleted, etc)
   
+### CanCan integration
+
+    cannot :manage, Recipes::Recipe
+    can :read, Recipes::Recipe
+    can :state, Recipes::Recipe # required to do any transitions
+    can :all_events, Recipes::Recipe
+
 ### i18n (state and event names):
 
 Just as usual for state_machine, see:

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

@@ -1 +1,16 @@
-= field.pretty_value
+.state-widget
+  = form.hidden_field field.method_name.to_s + '_event'
+  = field.form_value
+  :javascript
+    $(function() {
+      $('.state-btn').off('click').click(function(e){
+        e.preventDefault();
+        var $t = $(this), d = $t.data();
+        var $i = $t.parents('.state-widget').find('input')
+        $i.val(d.event);
+        console.log($i)
+        $t.siblings().removeClass('active')
+        $t.addClass('active')
+      })
+    })
+

data/config/locales/en.rails_admin_state_machine.yml

@@ -7,3 +7,4 @@ en:
       event_fired: '%{attr} event %{event} fired'
       error: "Error: %{err}"
       no_id: No ID provided
+      no_event: Don't change

data/config/locales/ru.rails_admin_state_machine.yml

@@ -7,4 +7,5 @@ ru:
       event_fired: '%{attr} выполнено событие %{event}'
       error: "Ошибка: %{err}"
       no_id: "Не указан ID"
+      no_event: "Не менять"
     

data/lib/rails_admin_state/action.rb

@@ -20,18 +20,22 @@ module RailsAdmin
 
         register_instance_option :controller do
           Proc.new do |klass|
+            unless @authorization_adapter.authorized?(:all_events, @abstract_model, @object)
+              @authorization_adapter.try(:authorize, params[:event].to_sym, @abstract_model, @object)
+            end
+
             @state_machine_options = ::RailsAdminState::Configuration.new @abstract_model
             if params['id'].present?
               begin
                 raise 'event disabled' if @state_machine_options.disabled?(params[:event].to_sym)
-                obj = @abstract_model.model.find(params['id'])
-                if obj.send("fire_#{params[:attr]}_event".to_sym, params[:event].to_sym)
-                  obj.save!
+                if @object.send("fire_#{params[:attr]}_event".to_sym, params[:event].to_sym)
+                  @object.save!
                   flash[:success] = I18n.t('admin.state_machine.event_fired', attr: params[:method], event: params[:event])
                 else
                   flash[:error] = obj.errors.full_messages.join(', ')
                 end
               rescue Exception => e
+                Rails.logger.error e
                 flash[:error] = I18n.t('admin.state_machine.error', err: e.to_s)
               end
             else

data/lib/rails_admin_state/configuration.rb

@@ -44,6 +44,9 @@ module RailsAdminState
       options[:disable].include? name.to_sym
     end
 
+    def authorize?
+      options[:authorize]
+    end
 
     protected
     def config

data/lib/rails_admin_state/field.rb

@@ -11,6 +11,7 @@ module RailsAdmin
 
           register_instance_option :pretty_value do
             @state_machine_options = ::RailsAdminState::Configuration.new @abstract_model
+            v = bindings[:view]
 
             state = bindings[:object].send(name)
             state_class = @state_machine_options.state(state)
@@ -23,6 +24,7 @@ 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]))
               event_class = @state_machine_options.event(event)
               ret << bindings[:view].link_to(
                 events[event].human_name,
@@ -36,13 +38,59 @@ module RailsAdmin
           end
 
           register_instance_option :formatted_value do
-            pretty_value
+            form_value
+          end
+
+          register_instance_option :form_value do
+            @state_machine_options = ::RailsAdminState::Configuration.new @abstract_model
+            c = bindings[:controller]
+            v = bindings[:view]
+
+            state = bindings[:object].send(name)
+            state_class = @state_machine_options.state(state)
+            s = bindings[:object].class.state_machines[name.to_sym].states[state.to_sym]
+            ret = [
+              '<div class="label ' + state_class + '">' + s.human_name + '</div>',
+              '<div style="height: 10px;"></div>'
+            ]
+
+            events = bindings[:object].class.state_machines[name.to_sym].events
+            empty = true
+            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]))
+              empty = false
+              event_class = @state_machine_options.event(event)
+              ret << bindings[:view].link_to(
+                events[event].human_name,
+                '#',
+                'data-attr' => name,
+                'data-event' => event,
+                class: "state-btn btn btn-mini #{event_class}",
+                style: 'margin-bottom: 5px;'
+              )
+            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-mini active",
+                style: 'margin-bottom: 5px;'
+              )
+            end
+            ('<div style="white-space: normal;">' + ret.join(' ') + '</div>').html_safe
           end
 
           register_instance_option :partial do
             :form_state
           end
 
+          register_instance_option :allowed_methods do
+            [method_name, (method_name.to_s + '_event').to_sym]
+          end
+
           register_instance_option :multiple? do
             false
           end

data/lib/rails_admin_state/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminState
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_state
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - glebtv