tramway-admin 1.32.2.5 → 1.33.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38545a69081961dbceae8db18e98f49405462bf332aeb852d001bf5332e0b127
-  data.tar.gz: 7f5e3942cba417767b231005efeddb6ea042ba8b91728946a286f4a97079d00e
+  metadata.gz: 4ff2e7ee2cba522a3d021f94ecfbe9da4cf66abc29daf4b2fab2e9d4bf47b0de
+  data.tar.gz: 89457c61c7d88cab5a9a49f38f6bfb6e83c2b43f520425961b164cde14996b25
 SHA512:
-  metadata.gz: d1e1eaf40a6b789dd0d9c368fa193152c484791397a259222d89a06f623332501e0b3af3d3d8a63d5785b6e8b9eed610bb091e632406b3a8b025cc2535878bfd
-  data.tar.gz: 14acb2b150a1dd2c5e0ecee95668c73ec93fab2805095d0918a95b36d21534e5afdd640a9f4afd3c02671231ebca72dc5d9e789e3fd534377eafe5d94e766cd8
+  metadata.gz: 329435596809bfae8589f002c23d7372f1ae5a67eb3be42e892272bf64ccbd217466ce55aa1cf50c0cd086157ba329bb7987f9171eb2507aa9a8ef2174029dc9
+  data.tar.gz: '084403024d287e9c02a93f5bcbcb382ba9ad57932cd0fa0d2d90ec5e6d8bd30685f2e82a03b934e04bd3fddfa0d242d2c02ced387349425e4db4c469925d6063'

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*
+```ruby
+Tramway::Admin.set_available_models(
+  Audited::Audit,
+  project: :your_project_name
+)
+```
+
+#### 2. Add this model to navbar
+
+```ruby
+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,9 +1,10 @@
-- if searchable_model?(model_class) || decorator_class(model_class).list_filters.any?
-  .col-md-8
-    .search
+- if searchable_model?(model_class) || is_there_any_filters?(model_class)
+  .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

@@ -5,14 +5,15 @@
 - 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
         = 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

@@ -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/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.5'
+    VERSION = '1.33.1.2'
   end
 end

metadata

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