tramway-admin 1.33.1.1 → 2.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb4fb3d9ec6d2f5bb4f56e65806cb737bf0898ee1186e2ada89498b4ce6fcdc
-  data.tar.gz: bd03f075aed1aa8fdd5b20af8c2c6e97be419f23a88369fcb0276c48a5e896b7
+  metadata.gz: 06da6f5c18c17f0be24539b30236b26b5f2e3c6c0056f284573dfd6bccfb20ba
+  data.tar.gz: 552df82bb3a6e29c6e7dc8cdc0bac707fe4223edbb4c9a7ab8cc0c3b2a8c51f1
 SHA512:
-  metadata.gz: '0936fb8b540e95c62e6c9e981a4c674b6a18f3e9732ccb82797df43c2b2090775fcbb8bd884cb7d5249ba8705e58b36ab69425beba5a2cdab809bc4a0391c39d'
-  data.tar.gz: 9c583df3d9be61ee6db2abe021ed717b422a0f8c93afd4a2764ca68931e8c9f454a5b2d8a9033e1dfdb51fd490ae0525d6ef00927593d9dea23e219e96e111f6
+  metadata.gz: aa6a08b7aa985dab46a7fbd2282c870edd6eabb66205ccd57bbea979e9482f298eee10091448a0e9211168cd57b4832210015b60e626028e3b8e511326e9cffd
+  data.tar.gz: 96c116c1996b4597ee1858c46b8230565adbc060561900470c4ccbf440080c27c8803b536966230b361f7c831c01374f0891ca069ef095c7a1d5b8951d98123b

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/assets/javascripts/tramway/admin/application.js

@@ -5,4 +5,9 @@
 //= require bootstrap-sprockets
 //= require ckeditor/init
 //= require selectize
+//= require clipboard
 //= require_tree .
+
+$(document).ready(function() {
+  let clipboard = new Clipboard('.clipboard-btn');
+})

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.1'
+    VERSION = '2.0.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.33.1.1
+  version: 2.0.0.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-25 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
@@ -322,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Engine for admin