tramway-admin 1.33 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd63c513ef46a0b0b80b96cc51f28c1ba69f1bc70c5e426da288887f4885cad7
-  data.tar.gz: '03884d0741244a9d7d33b0716c351fa68c05f9df09eb8a6b16994315c2940cfc'
+  metadata.gz: 5390a8ac2ff22518ce7381eda5eec47f0ede410e0cdcbcbf2ad4577a2e6d7869
+  data.tar.gz: 1599e0b6a50ef1f67df55a47d22ce29dc7438bf35d19f127d373d3594de9248a
 SHA512:
-  metadata.gz: 560e2d59668bfe3559a225dc03163bf2a61f032600e05568456d1c10ee97a7a6c0375c1ade4358fa5a536572582ed3c51c27a6f1cf144c433e3db3aaca254157
-  data.tar.gz: 61e0eda22ab3383e748a451a997303d9bd9130e23a7bb6575c056598838994a598642ee5ebcbc748464e47208ef67ba79c26973bea16e50846ff198336cce507
+  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'
@@ -239,7 +238,6 @@ class YourModel < Tramway::Core::ApplicationRecord
 #### 12. Run server `rails s`
 #### 13. Launch `localhost:3000/admin`
 
-
 ### CRUDs for models
 
 By default users with role `admin` have access to all models used as arguments in method `::Tramway::Admin.set_available_models`. If you want specify models by roles, use them as keys
@@ -393,6 +391,64 @@ window.current_locale = window.i18n_locale 'en'
 ```
 to the `app/assets/javascripts/admin/application.js.coffee` file
 
+### Decorator Helper methods
+
+#### date_view
+Returns a date in the format depending on localization
+
+*app/decorators/\*_decorator.rb*
+```ruby
+def created_at
+  date_view object.created_at
+end
+```
+#### datetime_view
+Returns a date and time in the format depending on localization
+
+*app/decorators/*_decorator.rb*
+```ruby
+def created_at
+  datetime_view object.created_at
+end
+```
+#### state_machine_view
+Returns the state of an object according to a state machine
+
+*app/decorators/*_decorator.rb*
+```ruby
+def state
+  state_machine_view object, :state
+end
+```
+#### image_view
+Returns an image in a particular format depending on the parameters of the original image file
+
+*app/decorators/\*_decorator.rb*
+```ruby
+def avatar
+  image_view object.avatar
+end
+```
+#### enumerize_view
+Returns object enumerations as text
+
+*app/decorators/\*_decorator.rb*
+```ruby
+def field_type
+  enumerize_view object.field_type
+end
+```
+
+#### file_view
+Returns file name and button to download it
+
+*app/decorators/\*_decorator.rb*
+```ruby
+def file_download
+  file_view object.file
+end
+```
+
 ## Notifications
 
 You can add notification to your admin panel to the navbar.
@@ -480,7 +536,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
@@ -489,7 +545,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,15 +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")}"
-          @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,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/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'
+    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'
+  version: '2.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.3.5
+        version: 1.18.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.3.5
+        version: 1.18.6
 - !ruby/object:Gem::Dependency
   name: tramway-auth
   requirement: !ruby/object:Gem::Requirement
@@ -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