tramway-admin 1.30.0.1 → 1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdea27f5059ea05e7dbe882c13f0c2e1a668a4c088e9969e0d90987ac76520bb
-  data.tar.gz: 37c7087ffb2c9bbfc67b24852a757883a3fd98b3403eacabcef80f2a771cfa03
+  metadata.gz: ddd6a8db1b87be8858fe60fc985278bb7089df3b5ffcc464c54f92959eafb6a5
+  data.tar.gz: 1d6e819e1964d4e44f4b74698c6083374a33a87144297ea684dfee658a06b614
 SHA512:
-  metadata.gz: 30d2265f4664079d95170d9f00d391f2b9be0a32f47c1e5494f1a1f87d83374dc359b5fc14a1351e932fbaa5b7fa9c9d02ee87329bb1985de0009864590bb440
-  data.tar.gz: 4083cd8b26c5503f520d4b38a810b24134ecde85e1d1e3e816162ee6503694e4df0a50c43435a39f8f00e817cfa7da4b4fbd48b66009ebf42915631de13cc674
+  metadata.gz: e8ef80f822c82bc6e4e16ea5d026ce7e41aa229d1133050f9f727083714c6e94ccf81fe699171ccc27640b343f4d8975481304c074c61c105bc06ea58f1267be
+  data.tar.gz: 1bec37b0cfb951204769eef233e32d1750ed32d28a4c6b1b629ae761736586dcc6740bc9fbbae9d0cd5d31302e1697ae4603bee40deea41eca772df029d250e0

data/README.md

@@ -99,12 +99,12 @@ Tramway::Admin.navbar_structure(
 
 #### 9. Create decorator for models
 
-*app/decorators/your_model_decorator.rb
+*app/decorators/your_model_decorator.rb*
 ```ruby
 class YourModelDecorator < Tramway::Core::ApplicationDecorator
   class << self
     def collections
-      [ :all ]
+      [ :all, :scope1, :scope2 ]
     end
   end
   
@@ -112,6 +112,8 @@ class YourModelDecorator < Tramway::Core::ApplicationDecorator
 end
 ```
 
+**NOTE:** `collections` methods must return array of scopes of `YourModel`. Every collection will be a tab in a list of your model in admin panel.
+
 #### 10. Add inheritance to YourModel
 
 *app/models/your_model.rb*

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

@@ -33,6 +33,11 @@ module Tramway
           records = model_class.active.send(collection)
           records = records.send "#{current_admin.role}_scope", current_admin.id
           records = records.ransack(params[:filter]).result if params[:filter].present?
+          params[:list_filters]&.each do |filter, value|
+            if value.present?
+              records = decorator_class.list_filters[filter.to_sym][:query].call(records, value)
+            end
+          end
           hash.merge! collection => records.count
         end
       end
@@ -91,7 +96,7 @@ module Tramway
         #  :tramway, :admin, :application_controller, :form_given, :model_not_included_to_tramway_admin,
         #  model: params[:model]
         # )
-        #raise "Looks like model #{params[:model]} is not included to tramway-admin for `#{current_admin.role}` role. Add it in the `config/initializers/tramway.rb`. This way `Tramway::Admin.set_available_models(#{params[:model]})`"
+        # raise "Looks like model #{params[:model]} is not included to tramway-admin for `#{current_admin.role}` role. Add it in the `config/initializers/tramway.rb`. This way `Tramway::Admin.set_available_models(#{params[:model]})`"
         Tramway::Admin.forms.include? params[:form].underscore.sub(%r{^admin/}, '').sub(/_form$/, '')
       end
 
@@ -110,6 +115,7 @@ module Tramway
       def current_admin
         user = Tramway::User::User.find_by id: session[:admin_id]
         return false unless user
+
         Tramway::User::UserDecorator.decorate user
       end
 
@@ -121,7 +127,9 @@ module Tramway
       end
 
       def authenticate_admin!
-        redirect_to '/admin/session/new' if !current_admin && !request.path.in?(['/admin/session/new', '/admin/session'])
+        if !current_admin && !request.path.in?(['/admin/session/new', '/admin/session'])
+          redirect_to '/admin/session/new'
+        end
       end
     end
   end

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

@@ -6,6 +6,11 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     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?
+    params[:list_filters]&.each do |filter, value|
+      if value.present?
+        records = decorator_class.list_filters[filter.to_sym][:query].call(records, value)
+      end
+    end
     records = records.send "#{current_admin.role}_scope", current_admin.id
     @records = decorator_class.decorate records.page params[:page]
   end

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

@@ -29,6 +29,7 @@ module Tramway
       def current_admin
         user = Tramway::User::User.find_by id: session[:admin_id]
         return false unless user
+
         Tramway::User::UserDecorator.decorate user
       end
     end

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

@@ -47,6 +47,11 @@ module Tramway::Admin
       model_class.methods.include? :full_text_search
     end
 
+    def build_options_for_select(name, collection)
+      selected_value = params[:list_filters].present? ? params[:list_filters][name] : nil
+      options_for_select(collection, selected_value)
+    end
+
     def admin_index_path_of_model(model_class, tab, filter)
       if tab
         records_path model: model_class, filter: filter, scope: tab

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

@@ -1,12 +1,15 @@
-- if searchable_model?(model_class)
+- if searchable_model?(model_class) || decorator_class(model_class).list_filters.any?
   .col-md-6
     .search
       = form_tag records_path, method: :get do |f|
         .form-group.text
           .input-group
-            = text_field_tag :search, params[:search], class: 'text form-control'
+            - if searchable_model?(model_class)
+              = 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]
+            - decorator_class(model_class).list_filters.each do |filter|
+              = select_tag "list_filters[#{filter[0]}]", build_options_for_select(filter[0], filter[1][:select_collection]), include_blank: true, class: 'form-control'
             .input-group-append
               = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.30.0.1'
+    VERSION = '1.31'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.30.0.1
+  version: '1.31'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views