tramway-admin 1.32.1.2 → 1.32.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dee5f088f753288890da09af68a6f8aab3b0d2370e6d94a6dc6e81b1bb17017
-  data.tar.gz: 3deb15305b766085f0613ab29833f53c201c845dc4149a91b1ef318d7d071e51
+  metadata.gz: 54810b97b5d2f0fd856461953a58e2b36dcae76ad116f408ccff7bec841ba498
+  data.tar.gz: b802cfb92fdf6c8b6153eb9ed308ddb8284756f6754072369f309266a0d540eb
 SHA512:
-  metadata.gz: f9ae53792e9fbd87d56d771025b274e857216697846bd6a84ca3ef157768aced9dc634efff9397f554c000760be1134a894bcc4d35ab5f67b287e996a56601b7
-  data.tar.gz: 647c711d44088f38df6605cf166b2f671826423be4baf403f40c759538cf789bc0660c203a155fa1340c9b1f2da0418a81689935d4b94138173c6a5156d181da
+  metadata.gz: dac5f5fa0d8cb6b85c30ad9bf7c4c5b6779f93ddbdba2513ef8d351a7e316bfbec4140f87f356a8bf842b1c6a78182c92d335fe8dd0deff1bd8d46fdb18b6cc8
+  data.tar.gz: 963ad750519bba6a9863d365548d45ec008761363473071b9e6caf27e5f7a02ca88d02a8d943d28ed6aa657a223fad2e88c33027a05d3380dfff35706fdc7075

data/README.md

@@ -1,4 +1,4 @@
-# Tramway::Admin
+# ![tramway-ico](https://raw.githubusercontent.com/kalashnikovisme/kalashnikovisme/master/%D1%82%D1%80%D1%8D%D0%BC%D0%B2%D1%8D%D0%B9%D0%B1%D0%B5%D0%B7%D1%84%D0%BE%D0%BD%D0%B0-min.png) Tramway::Admin
 
 Create admin panel for your application FAST!
 
@@ -43,7 +43,7 @@ Rails.application.routes.draw do
 end
 ```
 
-#### 4. Then make `tramway-core` installation. [How-to](https://github.com/ulmic/tramway-dev/blob/develop/tramway-core/README.md#installation)
+#### 4. Then make `tramway-core` installation. [How-to](https://github.com/Purple-Magic/tramway-core/blob/develop/README.md#installation)
 
 
 #### 5. And then execute:
@@ -94,11 +94,25 @@ Tramway::Admin.navbar_structure(
 *app/decorators/your_model_decorator.rb*
 ```ruby
 class YourModelDecorator < Tramway::Core::ApplicationDecorator
+  decorate_associations :messages, :posts
+  
   class << self
     def collections
       [ :all, :scope1, :scope2 ]
     end
     
+    def list_attributes
+      [ :begin_date, :end_date ]
+    end
+    
+    def show_attributes
+      [ :begin_date, :end_date ]
+    end
+    
+    def show_associations
+      [ :messages ]
+    end
+    
     def list_filters
       {
         filter_name: {
@@ -118,7 +132,7 @@ class YourModelDecorator < Tramway::Core::ApplicationDecorator
     end
   end
   
-  delegate :title, to: :object
+  delegate_attributes :title
 end
 ```
 
@@ -127,6 +141,9 @@ end
 * `list_filters` method returns hash of filters where:
   * select_collection - collection which will be in the select of filter. It must be compatible with [options_for_select](https://apidock.com/rails/ActionView/Helpers/FormOptionsHelper/options_for_select) method
   * query - some Active Record query which be used as a filter of records
+* `list_attributes` method returns array of attributes which will be shown in index page. If empty only `name` will be shown
+* `show_attributes` method returns array of attributes which will be shown in show page. If empty all attributes of the model will be shown
+* `show_associations` method returns array of decorated associations which will be show in show page. If empty no associations will be shown
 
 Filters naming:
 
@@ -175,7 +192,13 @@ class Admin::YourModelForm < Tramway::Core::ApplicationForm
         logo: :file,
         description: :ckeditor,
         date: :date_picker,
-        text: :text
+        text: :text,
+        birth_date: {
+          type: :default,
+          input_options: {
+            hint: 'It should be more than 18'
+          }
+        }
     end
   end
 end
@@ -238,6 +261,35 @@ Here docs about changing roles of `Tramway::User::User` model [Readme](https://g
 
 ## Associations management
 
+### has_many
+
+We have models Game and Packs.
+
+*app/models/game.rb*
+```ruby
+class Game < Tramway::Core::ApplicationRecord
+  has_many :packs
+end
+```
+
+*app/models/pack.rb*
+```ruby
+class Pack < Tramway::Core::ApplicationRecord
+  belongs_to :game
+end
+```
+
+**You want to manage packs in the Game show admin page**
+
+#### 1. Add association to PackDecorator
+
+*app/decorators/pack_decorator.rb*
+```ruby
+class GameDecorator < Tramway::Core::ApplicationDecorator
+  decorate_association :packs, as: :game # we recommend you to add association name in Pack model. You need it if association name of Game in Pack is not `game`
+end
+```
+
 ### has_and_belongs_to_many
 
 We have models Game and Packs.
@@ -400,8 +452,9 @@ en:
         my_dropdown: Very important dropdown
 ```
 
-## Contributing
-Contribution directions go here.
+## Errors
+
+* **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]`
 
 ## 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

@@ -21,7 +21,7 @@ module Tramway
       protected
 
       def check_available!
-        raise 'Model or Form is not available' if !model_given? && !form_given?
+        raise 'Tramway::Admin - Model or Form is not available' if !model_given? && !form_given?
       end
 
       def check_available_scope!
@@ -47,7 +47,7 @@ module Tramway
               end
             end
           end
-          hash.merge! collection => records.count
+          hash.merge! collection => records.send("#{current_admin.role}_scope", current_admin.id).count
         end
       end
 
@@ -92,7 +92,12 @@ module Tramway
       end
 
       def admin_form_class
-        "::#{current_admin.role.camelize}::#{model_class}Form".constantize
+        class_name = "::#{current_admin.role.camelize}::#{model_class}Form"
+        if defined? class_name
+          class_name.constantize
+        else
+          raise "Tramway::Admin - you should create form for role `#{current_admin.role}` to edit #{model_class} model. It should be named #{class_name}"
+        end
       end
 
       def model_given?

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

@@ -5,7 +5,12 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     scope = params[:scope].present? ? params[:scope] : :all
     records = model_class.active.order(id: :desc).send scope
     records = records.full_text_search params[:search] if params[:search].present?
-    records = records.ransack(params[:filter]).result if params[:filter].present?
+    if params[:filter].present?
+      if params[:filter].is_a? String
+        params[:filter] = JSON.parse params[:filter]
+      end
+      records = records.ransack(params[:filter]).result 
+    end
     params[:list_filters]&.each do |filter, value|
       case decorator_class.list_filters[filter.to_sym][:type]
       when :select

data/app/views/layouts/tramway/admin/shared/_navbar.html.haml

@@ -32,6 +32,9 @@
 
       %ul.nav.navbar-nav.ml-auto
         - if current_admin
+          %li.nav-item
+            %span.nav-link
+              = "#{current_admin.first_name} #{current_admin.last_name}"
           - if @notifications_count.present?
             - if @notifications_count > 0
               %li.nav-item.dropdown.notifications

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

@@ -14,3 +14,6 @@
       = hidden_field_tag :redirect, params[:redirect]
       = f.button :submit, t('helpers.links.save'), class: 'btn-success'
       = link_to t('helpers.links.back'), current_model_records_path, class: 'btn btn-secondary'
+
+-# NOTES
+-# * value_from_params helper is in tramway-core gem app/helpers/inputs_helpers.rb

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

@@ -6,7 +6,7 @@
           = 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]
+        = hidden_field_tag :filter, (params[:filter].is_a?(ActionController::Parameters) ? params[:filter].permit!.to_h.to_json : params[:filter])
         - decorator_class(model_class).list_filters.each_slice(3) do |slice|
           .row-fluid.filters
             - slice.each do |filter|

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.32.1.2'
+    VERSION = '1.32.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.32.1.2
+  version: 1.32.2.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core