tramway-admin 1.33.1 → 2.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c266371ff441a58ba52540f4f2110c1daca84b4a3a30ce9ee6705ad320e1d8a
-  data.tar.gz: 920e028b1ae7a9b058701e56b4c9c52d76c0a34f6120e1ac5415baa6edacfe95
+  metadata.gz: b472aebdf03b3eef04ec1841972e3962cfd448287454422572b9b7f6ebf2b941
+  data.tar.gz: 4883c98c8a25ee54d23e6406d445e7ab4c85c76e2a0ba92793762671659b6080
 SHA512:
-  metadata.gz: d6e7d0193b6abd26b1255f18a9b57a8d82f488321349a39ca80e1d789d5da31db6c5ecbfc5d9879423aaf0bb643a4b5ee41a1c9cb64aefcf94ce8d06251dbe33
-  data.tar.gz: ec305808b14d11bd92d70cd59dabffa83f259592a4b38d47bb39917146663f711e9203f58a5009ad320a2820c88de7d7e7963b020c6b97845a75e3a779708683
+  metadata.gz: bee644c43815bfe9765bfa77ea89fcf24a0ba47d7b2abd78f63497e06751cea1a360a7643b2fd2625245a488acd64aedf5d4985b83abbf03d6ae6f87ed9a07e0
+  data.tar.gz: e8913bce766c0d816d7c0b53a0c70de3850c87acd26a7d80c81baca467b902c69c159599b6b1d03bf5c67abe42ad35cbc66bdfd84c36c66bb0b145704982b816

data/README.md

@@ -10,9 +10,8 @@ How to use my plugin.
 *Gemfile*
 ```ruby
 gem 'tramway-admin'
-gem 'tramway-auth'
 gem 'tramway-user'
-gem 'state_machine', github: 'seuros/state_machine'
+gem 'aasm'
 gem 'bcrypt'
 gem 'haml-rails'
 gem 'selectize-rails'
@@ -421,6 +420,9 @@ def state
   state_machine_view object, :state
 end
 ```
+
+It takes locales from `I18n.t("state_machines.#{model_name}.#{state_machine_name}.states.#{state_value}")`
+
 #### image_view
 Returns an image in a particular format depending on the parameters of the original image file
 
@@ -537,7 +539,7 @@ Tramway uses [audited](https://github.com/collectiveidea/audited) to log actions
 #### 1. Add Audited::Audit model to available models
 
 *config/initializers/tramway.rb*
-```
+```ruby
 Tramway::Admin.set_available_models(
   Audited::Audit,
   project: :your_project_name
@@ -546,7 +548,7 @@ Tramway::Admin.set_available_models(
 
 #### 2. Add this model to navbar
 
-```
+```ruby
 Tramway::Admin.set_navbar_structure(
   Audited::Audit,
   project: :your_project_name

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

@@ -72,17 +72,6 @@ module Tramway
         end
       end
 
-      if Rails.env.production?
-        rescue_from StandardError do |exception|
-          Rails.logger.warn "ERROR MESSAGE: #{exception.message}"
-          Rails.logger.warn "BACKTRACE: #{exception.backtrace.first(30).join("\n")}"
-          Raven.capture_exception exception if defined?(Raven)
-
-          @exception = exception
-          render 'tramway/admin/shared/errors/server_error', status: 500, layout: false
-        end
-      end
-
       include Tramway::ClassNameHelpers
 
       def model_class

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

@@ -52,16 +52,23 @@ 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]}!")
+        redirect_to params[:redirect].present? ? params[:redirect] : record_path(@record_form.model)
+      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/helpers/tramway/admin/records_helper.rb

@@ -95,7 +95,7 @@ module Tramway::Admin
         new_record_path model: association.class_name,
                         redirect: current_model_record_path(object.model),
                         association.options[:class_name].underscore => {
-                          as || object.model.class.name.underscore => object.id
+                          as || object.model.class.name.underscore.gsub('/', '_') => object.id
                         }
       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/records/_search.html.haml

@@ -1,9 +1,10 @@
 - if searchable_model?(model_class) || is_there_any_filters?(model_class)
-  .col-md-8
-    .search
+  .search
+    .d-flex.flex-row-reverse.filters
       = form_tag records_path, class: 'form-inline', method: :get do |f|
         - if searchable_model?(model_class)
-          = text_field_tag :search, params[:search], class: 'text form-control'
+          .col-md-8
+            = text_field_tag :search, params[:search], class: 'text form-control'
         = hidden_field_tag :model, params[:model]
         = hidden_field_tag :scope, params[:scope]
         = hidden_field_tag :filter, (params[:filter].is_a?(ActionController::Parameters) ? params[:filter].permit!.to_h.to_json : params[:filter])
@@ -30,6 +31,5 @@
                     $('#filter_datepicker_begin_date').datepicker();
                     $('#filter_datepicker_end_date').datepicker();
                   });
-        .row-fluid.filters
-          .col-md-4.offset-md-8.submit
-            = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'
+        .col-md-4.submit
+          = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'

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

@@ -12,7 +12,8 @@
         = link_to fa_icon(:plus), new_current_model_record_path, class: 'btn btn-primary'
         - if defined? Tramway::Export::Engine
           = render 'tramway/export/button'
-    = render 'search', model_class: model_class
+    .col
+      = render 'search', model_class: model_class
 %hr
 %ul.nav.nav-tabs
   - if params[:search].present?

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'
+    VERSION = '2.0.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.33.1
+  version: 2.0.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-06 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