tramway-admin 1.12.2 → 1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adbc7ff4acdbb8ecc502f26e84ab9b9e60128a8a0f56054709b1e0e8c73c968f
-  data.tar.gz: b8cdc4eae2eba358324b06a7b9c4055a454dbec3b3b2ffe8210c3b40b802d815
+  metadata.gz: 50ac818ea8d1550212f1038579b3f0b59bc8a330ab213a0360b0abc93694e701
+  data.tar.gz: d131f12fdfe753dddea51ffac66f675299d98226649e00567a182a9614ed4169
 SHA512:
-  metadata.gz: f6f8f98f1b2c71012d300756a883eca75a6a0bf29e9e348633870fcb503e88e06cf8ab1077429baf78085d009c68544b66d55b38d799de262f8192152c52f249
-  data.tar.gz: 9c86d9fba9449ef73e4e59815275046cf3ed38e80f2ed6028faba1d4b0b3c5e8546055d4e23c222f8534fb94e40bacf4e9acd7dcdc7e3ce5b18ef14551fb3dc8
+  metadata.gz: e3be8b642284449ed77f21348eaff40c4836381b5d6471c4524e6958276be5ccd3442fb45eb6c7a1fe49ad0d076fcd01eb46f2cfebc6118c938b6dcd57a1b1ce
+  data.tar.gz: b3225934d90b57f2660f09420f7223b3ecdb529ee78c7db5f55a76f42c08e76e85582d1536329174b684eb4767521b83f352651cddc8517f66265ea2d673c900

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

@@ -3,6 +3,7 @@ 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.search params[:search] if params[:search]
+    records = records.ransack(params[:filter]).result if params[:filter]
     @records = decorator_class.decorate records.page params[:page]
   end
 
@@ -42,22 +43,3 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     redirect_to records_path
   end
 end
-
-private
-
-# FIXME replace to module
-def record_path(*args, **options)
-  super args, options.merge(model: params[:model])
-end
-
-def edit_record_path(*args, **options)
-  super args, options.merge(model: params[:model])
-end
-
-def new_record_path(*args, **options)
-  super args, options.merge(model: params[:model])
-end
-
-def records_path(*args, **options)
-  super args, options.merge(model: params[:model])
-end

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

@@ -45,11 +45,11 @@ module Tramway::Admin
       model_class.methods.include? :search
     end
 
-    def admin_index_path_of_model(model_class, tab = nil)
+    def admin_index_path_of_model(model_class, tab, filter)
       if tab
-        records_path model: model_class, scope: tab
+        records_path model: model_class, filter: filter, scope: tab
       else
-        records_path model: model_class
+        records_path model: model_class, filter: filter
       end
     end
 
@@ -60,7 +60,7 @@ module Tramway::Admin
              else 
                t("default.collections.#{tab}")
              end
-      "#{name} / #{count}"
+      params[:filter].present? ? name : "#{name} / #{count}"
     end
 
     def active_tab(tab, index)

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

@@ -7,5 +7,6 @@
             = 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]
             .input-group-append
               = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'

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

@@ -16,11 +16,11 @@
     %li.nav-item
       = link_to search_tab_title(@records.total_count), '#', class: 'nav-link active'
     %li.nav-item
-      = link_to t('helpers.actions.reset'), records_path(model: params[:model]), class: 'nav-link'
+      = link_to t('helpers.actions.reset'), records_path(model: params[:model], filter: params[:filter]), class: 'nav-link'
   - else
     - tabs.each_with_index do |tab, index|
       %li.nav-item
-        = link_to admin_index_path_of_model(model_class, tab), class: "#{active_tab(tab, index)} nav-link" do
+        = link_to admin_index_path_of_model(model_class, tab, params[:filter].permit!), class: "#{active_tab(tab, index)} nav-link" do
           != tab_title(model_class, tab, @counts[tab], state_method)
 %div{ id: (params[:search] ? :search : params[:scope]) }
   = render 'list'

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.12.2'
+    VERSION = '1.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: '1.13'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
@@ -118,6 +118,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: ransack
+  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'
 description: Engine for admin
 email:
 - kalashnikovisme@gmail.com