tramway-admin 1.32.2.4 → 1.33.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f79d0aa9d04ed68aef471f0dc570d73e4d601270521be63081ae558a18a5f1be
-  data.tar.gz: 2d57de82ee1b753978a5ad2ac0534a0a93a67b2b41ff456606265ab12f3e5097
+  metadata.gz: 8fb4fb3d9ec6d2f5bb4f56e65806cb737bf0898ee1186e2ada89498b4ce6fcdc
+  data.tar.gz: bd03f075aed1aa8fdd5b20af8c2c6e97be419f23a88369fcb0276c48a5e896b7
 SHA512:
-  metadata.gz: 1c3a64f26bfcce263809d2a7b2a2d906b53966855866b90bb6500da180a09c577a59ea6a2d092d93f8a40a32b929989c5095f74884fcd5a542e87b7380d16f12
-  data.tar.gz: bfe8a88ee5c4c903f280a56bdeffdb2352e1953456f836aff20f66d11c52e15ce784e659472c201f4717ba0118458181fd1fa3573459dc5b9a00233c890a34e5
+  metadata.gz: '0936fb8b540e95c62e6c9e981a4c674b6a18f3e9732ccb82797df43c2b2090775fcbb8bd884cb7d5249ba8705e58b36ab69425beba5a2cdab809bc4a0391c39d'
+  data.tar.gz: 9c583df3d9be61ee6db2abe021ed717b422a0f8c93afd4a2764ca68931e8c9f454a5b2d8a9033e1dfdb51fd490ae0525d6ef00927593d9dea23e219e96e111f6

data/README.md

@@ -239,7 +239,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 +392,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.
@@ -471,5 +528,36 @@ en:
 
 * **Model or Form is not available** - `params[:model]` or `params[:form]` is empty **OR** current user does not have access to model or form in `params[:model]` or `params[:form]`
 
+## Good features
+
+### Get actions log in admin panel
+
+Tramway uses [audited](https://github.com/collectiveidea/audited) to log actions of models. That's why all we need it's creating view for model `Audited::Audit`
+
+#### 1. Add Audited::Audit model to available models
+
+*config/initializers/tramway.rb*
+```
+Tramway::Admin.set_available_models(
+  Audited::Audit,
+  project: :your_project_name
+)
+```
+
+#### 2. Add this model to navbar
+
+```
+Tramway::Admin.set_navbar_structure(
+  Audited::Audit,
+  project: :your_project_name
+)
+```
+
+#### 3. Generate decorator for Audited::Audit
+
+```
+rails g tramway:admin:model Audited::Audit
+```
+
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

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/helpers/tramway/admin/application_helper.rb

@@ -16,6 +16,7 @@ module Tramway
       include ::Tramway::Admin::ActionsHelper
       include ::Tramway::Collections::Helper
       include ::Tramway::Core::CopyToClipboardHelper
+      include ::Tramway::Admin::TramwayModelHelper
 
       def object_type(object)
         object_class_name = if object.class.ancestors.include? ::Tramway::Core::ApplicationDecorator

data/app/helpers/tramway/admin/records_helper.rb

@@ -99,5 +99,9 @@ module Tramway::Admin
                         }
       end
     end
+
+    def is_there_any_filters?(model_class)
+      decorator_class(model_class).list_filters&.any?
+    end
   end
 end

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

@@ -24,10 +24,11 @@
               
             = delete_button url: current_model_record_path(record.id), form_options: { class: :smart_button }, button_options: { class: 'btn btn-xs btn-danger' } do
               = fa_icon 'trash-alt'
-          %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 }
+          - if tramway_model?(model_class)
+            %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 }
 = paginate @records, theme: 'twitter-bootstrap-4'

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

@@ -1,4 +1,4 @@
-- if searchable_model?(model_class) || decorator_class(model_class).list_filters.any?
+- if searchable_model?(model_class) || is_there_any_filters?(model_class)
   .col-md-8
     .search
       = form_tag records_path, class: 'form-inline', method: :get do |f|

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

@@ -5,7 +5,7 @@
 - tabs = get_collection
 .page-header
   .row
-    - search_render_show = searchable_model?(model_class) || decorator_class(model_class).list_filters.any?
+    - search_render_show = searchable_model?(model_class) || is_there_any_filters?(model_class)
     %div{ class: "col-md-#{search_render_show ? 4 : 12}" }
       %h1
         = current_title

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

@@ -4,5 +4,6 @@
   %td
     = value
   %td
-    - if attribute_name.to_s != 'state' && object.model.class.state_machines.keys.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 }
+    - if tramway_model?(model_class)
+      - if attribute_name.to_s != 'state' && object.model.class.state_machines.keys.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.rb

@@ -11,6 +11,7 @@ require 'tramway/admin/welcome_page_actions'
 require 'tramway/admin/navbar'
 require 'tramway/error'
 require 'tramway/admin/generators/install_generator'
+require 'tramway/admin/tramway_model_helper'
 
 module Tramway
   Auth.layout_path = 'tramway/admin/application'

data/lib/tramway/admin/generators/model_generator.rb

@@ -25,14 +25,14 @@ module Tramway
         def run_decorator_generator
           template(
             'decorator.rb.erb',
-            Rails.root.join("app/decorators/#{file_name}_decorator.rb"),
+            Rails.root.join("app/decorators/#{file_path}_decorator.rb"),
           )
         end
 
         def run_forms_generator
           template(
             'form.rb.erb',
-            Rails.root.join("app/forms/#{user_role}/#{file_name}_form.rb"),
+            Rails.root.join("app/forms/#{user_role}/#{file_path}_form.rb"),
           )
         end
 

data/lib/tramway/admin/generators/templates/decorator.rb.erb

@@ -2,6 +2,12 @@ class <%= class_name %>Decorator < Tramway::Core::ApplicationDecorator
   # Associations you want to show in admin dashboard
   # decorate_associations :messages, :posts
 
+  delegate_attributes(
+<% attributes.each do |attr| -%>
+        :<%= attr %>,
+<% end -%>
+  )
+
   class << self
     def collections
       # [ :all, :scope1, :scope2 ]
@@ -47,6 +53,4 @@ class <%= class_name %>Decorator < Tramway::Core::ApplicationDecorator
       # }
     end
   end
-
-  # delegate_attributes :title
-end
+end

data/lib/tramway/admin/records_models.rb

@@ -9,7 +9,7 @@ module Tramway::Admin::RecordsModels
       if model.class == Class || model.class == String
         @available_models[project][role].merge! model.to_s => %i[index show update create destroy]
       elsif model.class == Hash
-        @available_models[project][role].merge! model.to_s
+        @available_models[project][role].merge! model
       end
     end
     @available_models = @available_models.with_indifferent_access

data/lib/tramway/admin/tramway_model_helper.rb

@@ -0,0 +1,5 @@
+module Tramway::Admin::TramwayModelHelper
+  def tramway_model?(model_class)
+    model_class.ancestors.include? Tramway::Core::ApplicationRecord
+  end
+end

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.32.2.4'
+    VERSION = '1.33.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.32.2.4
+  version: 1.33.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-01-25 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
@@ -300,6 +300,7 @@ files:
 - lib/tramway/admin/record_routes_helper.rb
 - lib/tramway/admin/records_models.rb
 - lib/tramway/admin/singleton_models.rb
+- lib/tramway/admin/tramway_model_helper.rb
 - lib/tramway/admin/version.rb
 - lib/tramway/admin/welcome_page_actions.rb
 homepage: https://github.com/kalashnikovisme/tramway-dev