administrate_ransack 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30740fba6ba03d609c74a19fcce57700128abb8055735eb6e341ff445881b076
-  data.tar.gz: 1b040d838cb34725d8a654a6cf7376132e81e34a0a48107501ad175a9da06518
+  metadata.gz: 03cd63f65e6f42ec034fa6452a68effb67323fbe935036a643c4f17f6013adfa
+  data.tar.gz: d7bb0e58c6a9a0cd8791a8d4faf130361a9bfc823e6c006ac581213ad874fc3b
 SHA512:
-  metadata.gz: 157edfd6f4bb409bdac2394f815246e6e3b940bc5709c7d2a1cea3270c5ee71f8ae50f0a6d982765a3465473af778dd4034d7bc3a9ba40580269ae821c522a9c
-  data.tar.gz: 8af8b11b461b4d23db7acbed9663ed21c65a3e18f300cc81ecc85269e332fe63cb7fc98a8435a4732e19fb7842d027964c537b646599830a428d765208821ce4
+  metadata.gz: 31d0540c3ed2218c72fe49e1f8ce25c9cfcd2b8e45e716fde2343a75ef72af886120b555f27821e6412a33c76bd51cd6238d29f37e037f5a4b2be63114ce581f
+  data.tar.gz: 288e6c8a0ec50670583e4a5fc5b9e65bf4238a01538e57308bdfa20d3ab5d626262aca02d90508a924ffa41a775ff4b8c1e1a20630dd5d2973e8c18e6cf8ba47

data/README.md

@@ -16,7 +16,7 @@ prepend AdministrateRansack::Searchable
 ```erb
 <%= render('administrate_ransack/filters') %>
 ```
-- See the Customizations section to change the attributes list
+- See the Usage section for extra options
 
 ## Usage
 - The filters partial accepts some optional parameters:
@@ -37,12 +37,6 @@ end
 
 ## Notes
 - Administrate Search logic works independently from Ransack searches, I suggest to disable it eventually (ex. overriding `show_search_bar?` in the controller)
-- Ordering by clicking on the headers of the table preserving the Ransack searches requires a change to the headers links, replacing the th links of *_collection* partial with:
-```rb
-sort_link(@ransack_results, attr_name) do
-  # ...
-end
-```
 - Date/time filters use Rails `datetime_field` method which produces a `datetime-local` input field, at the moment this type of element is not broadly supported, a workaround is to include [flatpickr](https://github.com/flatpickr/flatpickr) datetime library.
   + This gem checks if `flatpickr` function is available in the global scope and applies it to the `datetime-local` filter inputs;
   + you can include the library using your application assets or via CDN, ex. adding to **app/views/layouts/admin/application.html.erb**:

data/app/views/administrate_ransack/_filters.html.erb

@@ -23,6 +23,7 @@
     clear_filters_path = url_for(url_for([:admin, @ransack_results.klass]))
   end
 %>
+
 <%= search_form_for form_path, form_options do |f| %>
   <div class="filters">
     <% attribute_types.each do |field, type| %>
@@ -82,7 +83,7 @@
   </div>
 
   <div class="filters-buttons">
-    <%= f.submit %>
+    <%= f.submit t('administrate_ransack.filters.search'), name: nil %>
     <%= link_to t('administrate_ransack.filters.clear_filters'), clear_filters_path, class: 'btn-clear-filters' %>
   </div>
 <% end %>

data/config/locales/en.yml

@@ -3,4 +3,5 @@ en:
     filters:
       'clear_filters': Clear filters
       'no': 'No'
+      'search': Search
       'yes': 'Yes'

data/lib/administrate_ransack/searchable.rb

@@ -8,5 +8,20 @@ module AdministrateRansack
       @ransack_results = super.ransack(params[:q])
       @ransack_results.result(distinct: true)
     end
+
+    # ref => https://github.com/thoughtbot/administrate/blob/v0.15.0/app/helpers/administrate/application_helper.rb#L54-L60
+    def sanitized_order_params(page, current_field_name)
+      collection_names = page.item_includes + [current_field_name]
+      association_params = collection_names.map do |assoc_name|
+        { assoc_name => %i[order direction page per_page] }
+      end
+      params.permit(:search, :id, :page, :per_page, association_params, q: {})
+    end
+
+    class << self
+      def prepended(base)
+        base.helper_method :sanitized_order_params
+      end
+    end
   end
 end

data/lib/administrate_ransack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdministrateRansack
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate_ransack
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Administrate Ransack plugin