rails_admin_state 1.6.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3bd861e03c61582cf8332e0f43de009998ddd2cb17ae610d28f0cef471232b8
-  data.tar.gz: 984dad7bd37df4de260a81189c44330b034ace5fd8fdac438552a6acba40198a
+  metadata.gz: a3dfba5319d0c88df1f3be75dd3e2ae8fa33b40b62455c134db782cc512b7869
+  data.tar.gz: '0917cebc9cb29dc8aac1ab9ba6553cce676877dc1d00a2617883036a2dc69fc0'
 SHA512:
-  metadata.gz: 0e90994431e5924d0a0f8308bba41eb0edecc65880ccdc9ec13aee39c2f47680e86002afd6eaf1b61641a5568ee440d932d0d31d0479987b52a24dc98b67fab2
-  data.tar.gz: 616398eda1a7e761db1dcceabf73666301714dddd37c36fec1dee4024f7c9c408e725df1419021c7984063c7ea6ddaefde04a99a80921d383c484f2c6935371f
+  metadata.gz: 6927e33771eaec9dfabba5bb0fb7da1bc2de94d4b57351a65fd43b4dfef265e1bac060a6a0339c31f6698ee5bf945207b636f01315c6ff2871b7c3f3b18be43d
+  data.tar.gz: c381c5efc393d480f54cff46797a61813b5d8f18e1eff72a41a3421560ef2bd995288f1badbb4ef85d580816ea9d6fa12c400907d9fb2780625d3f9cfcb2b67e

data/lib/rails_admin_state/action.rb

@@ -30,18 +30,36 @@ 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)
                   @object.save!
-                  flash[:success] = I18n.t('admin.state_machine.event_fired', attr: params[:method], event: params[:event])
+                  if params['ajax'].present?
+                    render json: {
+                      html: RailsAdmin::Config::Fields::Types::State.pretty_value_from_params(params[:attr], @abstract_model, @object, @authorization_adapter, rails_admin, @state_machine_options)
+                    }
+                  else
+                    flash[:success] = I18n.t('admin.state_machine.event_fired', attr: params[:method], event: params[:event])
+                  end
                 else
-                  flash[:error] = @object.errors.full_messages.join(', ')
+                  if params['ajax'].present?
+                    render text: @object.errors.full_messages.join(', ')
+                  else
+                    flash[:error] = @object.errors.full_messages.join(', ')
+                  end
                 end
               rescue Exception => e
                 Rails.logger.error e
-                flash[:error] = I18n.t('admin.state_machine.error', err: e.to_s)
+                if params['ajax'].present?
+                  render text: I18n.t('admin.state_machine.error', err: e.to_s)
+                else
+                  flash[:error] = I18n.t('admin.state_machine.error', err: e.to_s)
+                end
               end
             else
-              flash[:error] = I18n.t('admin.state_machine.no_id')
+              if params['ajax'].present?
+                render text: I18n.t('admin.state_machine.no_id')
+              else
+                flash[:error] = I18n.t('admin.state_machine.no_id')
+              end
             end
-            redirect_back(fallback_location: rails_admin.dashboard_path)
+            redirect_back(fallback_location: rails_admin.dashboard_path) unless params['ajax'].present?
           end
         end
 

data/lib/rails_admin_state/field.rb

@@ -10,35 +10,13 @@ module RailsAdmin
           include RailsAdmin::Engine.routes.url_helpers
 
           register_instance_option :pretty_value do
+
             @state_machine_options = ::RailsAdminState::Configuration.new @abstract_model
             v = bindings[:view]
+            obj = bindings[:object]
+            c = bindings[:controller]
 
-            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>'
-            ]
-            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)
-                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 btn-xs #{event_class}",
-                  style: 'margin-bottom: 5px;'
-                )
-              end
-            end
-            ('<div style="white-space: normal;">' + ret.join(' ') + '</div>').html_safe
+            self.class.pretty_value_from_params(name, @abstract_model, obj, c.try(:authorization_adapter), v, @state_machine_options, read_only)
           end
 
           register_instance_option :formatted_value do
@@ -63,7 +41,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)
-                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
@@ -91,7 +69,7 @@ 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].class.state_machines[name.to_sym].states[state.to_sym].human_name
@@ -112,6 +90,55 @@ module RailsAdmin
           register_instance_option :multiple? do
             false
           end
+
+          def self.pretty_value_from_params name, abstract_model, obj, authorization_adapter, view, state_machine_options, read_only = false
+            state = obj.send(name)
+            state_class = state_machine_options.state(state)
+            s = obj.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>'
+            ]
+            unless read_only
+              events = obj.class.state_machines[name.to_sym].events
+              obj.send("#{name}_events".to_sym).each do |event|
+                next if state_machine_options.disabled?(event)
+                unless authorization_adapter.nil?
+                  adapter = authorization_adapter
+                  next unless (adapter.authorized?(:state, abstract_model, obj) && (adapter.authorized?(:all_events, abstract_model, obj) || adapter.authorized?(event, abstract_model, obj)))
+                end
+                event_class = state_machine_options.event(event)
+                ret << ActionController::Base.helpers.link_to(
+                  events[event].human_name,
+                  view.state_path(model_name: abstract_model, id: obj.id, event: event, attr: name),
+                  method: :post,
+                  class: "btn btn-mini btn-xs #{event_class}",
+                  style: 'margin-bottom: 5px;',
+                  onclick: <<-END.strip_heredoc.gsub("\n", ' ').gsub(/ +/, ' ')
+                    event.preventDefault();
+                    event.stopPropagation();
+                    var $t = $(this);
+                    var old_html = $t.html();
+                    $t.html("<i class='fa fa-spinner fa-spin'></i>");
+                    $.ajax({
+                      type: "POST",
+                      url: $t.attr("href"),
+                      data: {ajax:true},
+                      success: function(r) {
+                        $t.parent().parent().html(r.html);
+                      },
+                      error: function(e) {
+                        $t.html(old_html);
+                        alert(e.responseText);
+                      }
+                    });
+                    return false;
+                  END
+                )
+              end
+            end
+            ('<div style="white-space: normal;">' + ret.join(' ') + '</div>').html_safe
+          end
         end
       end
     end

data/lib/rails_admin_state/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminState
-  VERSION = "1.6.2"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_state
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.8.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin