tramway-admin 1.13.0.2 → 1.13.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed9aefc24b20990c7b58bea12413ea29388b884deec6e9d8b071c035dd3d2085
-  data.tar.gz: 044dec2c33bbfc7ecf439cdbf11cf3a261536beb5ef77c2bcda643e2ae790098
+  metadata.gz: 22903be771b4f43ca1c2202b281e6efbb699f07152eb83b157ea81996f099b38
+  data.tar.gz: 0f5ce4ee4073da7e89372069f45c00f5bf122ed8e3032e4bcd1d8e5e97015d95
 SHA512:
-  metadata.gz: 0c009068aaeb19bfda3c7fcd7d1efb42129f4f22eca9ed3602909ad1fc2b4feded6326e0c267b00f0dfb4187acf6f601380500cf4c6b2730525513e73bdf330a
-  data.tar.gz: c7cc9f64154f9f546705c06fc57ac23c054a08b2225e1f07eb23271297d546b140f3a91789ab67109019727cbb1027955348d6c2da27d10929557f0f9271a9a9
+  metadata.gz: 1252365d81b686b68c28b9f2c36dd7729a8b0cafa33e0e4d9299d0084257cd3892c8c46bda8199952b3de376db2d69674d3d61f0b4838b3fdf199c1982b542f7
+  data.tar.gz: aafd21755e3d3a86ab0a3e7afd452cfbb9495e151c1bc6ea93ec63f4303bb6448007e036f9978bcfb39e89a8a08ffbb41ba6b48a7f5bb25e1e1ec9c6bc499b16

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

@@ -2,8 +2,8 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
   def index
     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 = records.full_text_search params[:search] if params[:search]
+    records = records.ransack(params[:filter]).result if params[:filter].present?
     @records = decorator_class.decorate records.page params[:page]
   end
 

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

@@ -42,7 +42,7 @@ module Tramway::Admin
     end
 
     def searchable_model?(model_class)
-      model_class.methods.include? :search
+      model_class.methods.include? :full_text_search
     end
 
     def admin_index_path_of_model(model_class, tab, filter)

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

@@ -20,7 +20,7 @@
   - else
     - tabs.each_with_index do |tab, index|
       %li.nav-item
-        = link_to admin_index_path_of_model(model_class, tab, params[:filter]&.permit!), class: "#{active_tab(tab, index)} nav-link" do
+        = link_to admin_index_path_of_model(model_class, tab, (params[:filter].present? ? params[:filter] : nil)&.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.13.0.2'
+    VERSION = '1.13.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.13.0.2
+  version: 1.13.0.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views