tramway-admin 1.33.1.2 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff2e7ee2cba522a3d021f94ecfbe9da4cf66abc29daf4b2fab2e9d4bf47b0de
-  data.tar.gz: 89457c61c7d88cab5a9a49f38f6bfb6e83c2b43f520425961b164cde14996b25
+  metadata.gz: 5390a8ac2ff22518ce7381eda5eec47f0ede410e0cdcbcbf2ad4577a2e6d7869
+  data.tar.gz: 1599e0b6a50ef1f67df55a47d22ce29dc7438bf35d19f127d373d3594de9248a
 SHA512:
-  metadata.gz: 329435596809bfae8589f002c23d7372f1ae5a67eb3be42e892272bf64ccbd217466ce55aa1cf50c0cd086157ba329bb7987f9171eb2507aa9a8ef2174029dc9
-  data.tar.gz: '084403024d287e9c02a93f5bcbcb382ba9ad57932cd0fa0d2d90ec5e6d8bd30685f2e82a03b934e04bd3fddfa0d242d2c02ced387349425e4db4c469925d6063'
+  metadata.gz: 296ebeca8c4c69f989c4240e3348f2ec47c77f29d8a2066eb9ce233479e78241f29da09619de0d228332d3cef79f299bc9229008bfa841ca7629d0d782b43cc7
+  data.tar.gz: 8fe4ca13d159e6953157ed082caf92a5b5aede82aca7ac609cc00a24be067d3e580c9b1c3625b5736414504bb3a53bd4667cd7704a880c11750155e501366306

data/README.md

@@ -10,7 +10,6 @@ How to use my plugin.
 *Gemfile*
 ```ruby
 gem 'tramway-admin'
-gem 'tramway-auth'
 gem 'tramway-user'
 gem 'state_machine', github: 'seuros/state_machine'
 gem 'bcrypt'

data/app/controllers/tramway/admin/records_controller.rb

@@ -52,16 +52,22 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
 
   def update
     @record_form = admin_form_class.new model_class.active.find params[:id]
-    if @record_form.submit params[:record]
-      redirect_to params[:redirect].present? ? params[:redirect] : record_path(@record_form.model)
+    if params[:record][:aasm_event].present?
+      if @record_form.model.send("may_#{params[:record][:aasm_event]}?")
+        @record_form.model.send("#{params[:record][:aasm_event]}!")
+      end
     else
-      render :edit
+      if @record_form.submit params[:record]
+        redirect_to params[:redirect].present? ? params[:redirect] : record_path(@record_form.model)
+      else
+        render :edit
+      end
     end
   end
 
   def destroy
     record = model_class.active.find params[:id]
-    record.remove
+    record.remove!
     redirect_to params[:redirect].present? ? params[:redirect] : records_path
   end
 end

data/app/models/tramway/user/user.rb

@@ -2,6 +2,7 @@
 
 class Tramway::User::User < ::Tramway::Core::ApplicationRecord
   has_secure_password # FIXME: remove repeating from tramway-user
+  include ::AASM
 
   enumerize :role, in: %i[user admin], default: :admin
 

data/app/views/tramway/admin/records/_list.html.haml

@@ -28,7 +28,7 @@
             %br
             %br
             .btn-group{ data: { toggle: :buttons } }
-              - record.model.class.state_machines.keys.each do |state_method|
-                - unless state_method == :state
-                  = state_events_buttons record, state_method: state_method, model_param_name: :record, controller: 'tramway/admin/records', action: :update, parameters: { redirect: current_model_records_path(page: params[:page], scope: params[:scope], filter: params[:filter], focus: focus_selector(index)), model: record.class.model_name }, button_options: { class: :smart_button }
+              - record.model.class.state_machines_names.each do |state_machine_name|
+                - unless state_machine_name == 'default'
+                  = state_events_buttons record, state_method: state_machine_name, model_param_name: :record, controller: 'tramway/admin/records', action: :update, parameters: { redirect: current_model_records_path(page: params[:page], scope: params[:scope], filter: params[:filter], focus: focus_selector(index)), model: record.class.model_name }, button_options: { class: :smart_button }
 = paginate @records, theme: 'twitter-bootstrap-4'

data/app/views/tramway/admin/shared/show/_attribute_tr.html.haml

@@ -5,5 +5,5 @@
     = value
   %td
     - if tramway_model?(model_class)
-      - if attribute_name.to_s != 'state' && object.model.class.state_machines.keys.include?(attribute_name.to_sym)
+      - if attribute_name.to_s != 'state' && object.model.class.aasm.states.map(&:name).include?(attribute_name.to_sym)
         = state_events_buttons object, state_method: attribute_name, model_param_name: :record, controller: 'tramway/admin/records', action: :update, parameters: { model: object.class.model_name }, button_options: { class: :smart_button }

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.33.1.2'
+    VERSION = '2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.33.1.2
+  version: '2.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core
@@ -196,6 +196,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: aasm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement