madmin 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effe2cef8e6d737651ad3f18b60445620d28b3f8cbadedf8981e866d27a087ca
-  data.tar.gz: 97b00adc461c766b00ee2bae3df3c950d04a44a41fc654e93553ee4a5f8dc8f1
+  metadata.gz: de0ee3515b8f8689bbd5c7b6b99675c2724f0be4cf7774e97d71da99076f3b68
+  data.tar.gz: 4224940c11670cfbc2a481cc0001ad64d846595929993f5971490c1f53e0343c
 SHA512:
-  metadata.gz: e052d7299477fc54e9c3a8713de32f6c995a58794eaa3a3458dcd3fd48b642ee75dec8aa1ae4e8a8a8f8985994695f2830c3bdb8db0e35158126e03f6acbf79a
-  data.tar.gz: e00c4c786ccb379546abef4c07d4b4405a7df23d5da382bbfec2032c29b320dd44a80026705d2a2f43bca3afc647ce9e2b2bbfabc758ec5c42c0e27ec2dc51a2
+  metadata.gz: eaf9f28c5e3dac557dceaff92f823b3372d9c927a2c429d296da83bee28c3f14cd78b31bf198bde7d43bfc8025aaa01d96e1586edc42ebef5c49e3f827929cfc
+  data.tar.gz: e0b561bb2c7d0367238ba4c9af7794161480396ccf2bc625ffad2a3adfbeb1b6919490f59a8fc24c1eac89eec4f0162e202186dc47913f41351b893972c2fb13

data/app/assets/stylesheets/madmin/pagination.css

@@ -35,7 +35,7 @@
     cursor: default;
   }
 
-  a.current {
+  a[aria-current="page"] {
     color: #ffffff;
     background-color: var(--primary-color);
   }

data/app/controllers/madmin/base_controller.rb

@@ -1,7 +1,12 @@
 module Madmin
   class BaseController < ActionController::Base
     include ::ActiveStorage::SetCurrent if defined?(::ActiveStorage)
-    include Pagy::Backend
+
+    if Gem::Version.new(Pagy::VERSION) >= Gem::Version.new("43.0.0.rc")
+      include Pagy::Method
+    else
+      include Pagy::Backend
+    end
 
     protect_from_forgery with: :exception
   end

data/app/controllers/madmin/resource_controller.rb

@@ -16,9 +16,6 @@ module Madmin
           render json: @records.map { |r| {name: @resource.display_name(r), id: r.id} }
         }
       end
-    rescue Pagy::OverflowError
-      params[:page] = 1
-      retry
     end
 
     def show

data/app/helpers/madmin/application_helper.rb

@@ -1,6 +1,6 @@
 module Madmin
   module ApplicationHelper
-    include Pagy::Frontend
+    include Pagy::Frontend if defined? Pagy::Frontend
     include Rails.application.routes.url_helpers
 
     def clear_search_params

data/app/views/madmin/application/index.html.erb

@@ -65,6 +65,11 @@
 </div>
 
 <div class="pagination">
-  <%== pagy_nav @pagy if @pagy.pages > 1 %>
-  <%== pagy_info @pagy %>
+  <% if @pagy.respond_to?(:series_nav) %>
+    <%== @pagy.series_nav if @pagy.last > 1 %>
+    <%== @pagy.info_tag %>
+  <% else %>
+    <%== pagy_nav @pagy if @pagy.last > 1 %>
+    <%== pagy_info @pagy %>
+  <% end %>
 </div>

data/app/views/madmin/fields/has_many/_show.html.erb

@@ -8,6 +8,11 @@
 <% end %>
 
 <div class="pagination">
-  <%== pagy_nav pagy if pagy.pages > 1 %>
-  <%== pagy_info pagy %>
+  <% if pagy.respond_to?(:series_nav) %>
+    <%== pagy.series_nav if pagy.last > 1 %>
+    <%== pagy.info_tag %>
+  <% else %>
+    <%== pagy_nav pagy if pagy.last > 1 %>
+    <%== pagy_info pagy %>
+  <% end %>
 </div>

data/app/views/madmin/fields/nested_has_many/_show.html.erb

@@ -8,6 +8,11 @@
 <% end %>
 
 <div class="pagination">
-  <%== pagy_nav pagy if pagy.pages > 1 %>
-  <%== pagy_info pagy %>
+  <% if pagy.respond_to?(:series_nav) %>
+    <%== pagy.series_nav if pagy.last > 1 %>
+    <%== pagy.info_tag %>
+  <% else %>
+    <%== pagy_nav pagy if pagy.last > 1 %>
+    <%== pagy_info pagy %>
+  <% end %>
 </div>

data/lib/madmin/fields/has_many.rb

@@ -1,8 +1,6 @@
 module Madmin
   module Fields
     class HasMany < Field
-      include Pagy::Backend
-
       def options_for_select(record)
         if (records = record.send(attribute_name))
           return [] unless records.first
@@ -35,11 +33,29 @@ module Madmin
         true
       end
 
-      def paginated_value(record, params)
-        param_name = "#{attribute_name}_page"
-        pagy value(record), page: params[param_name].to_i, page_param: param_name
-      rescue Pagy::OverflowError, Pagy::VariableError
-        pagy value(record), page: 1, page_param: param_name
+      if Gem::Version.new(Pagy::VERSION) >= Gem::Version.new("43.0.0.rc")
+        include Pagy::Method
+
+        def paginated_value(record, params)
+          page_key = "#{attribute_name}_page"
+          request = {
+            query: {
+              "#{attribute_name}_page" => [params[page_key].to_i, 1].max
+            }
+          }
+          pagy value(record), page_key: page_key, request: request
+        rescue Pagy::OptionError
+        end
+      else
+        include Pagy::Backend
+
+        def paginated_value(record, params)
+          page_key = "#{attribute_name}_page"
+          page = [params[page_key].to_i, 1].max
+          pagy value(record), page: page, page_param: page_key
+        rescue Pagy::OverflowError, Pagy::VariableError
+          pagy value, page: 1, page_param: page_key
+        end
       end
     end
   end

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "2.0.5"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Oliver