Merge pull request #4316 from AntonKhorev/block-reason-max-length

[rails.git] / app / helpers / browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index c8fc8245c5e29e61bd5363c0bbde3aff7b31e3b0..69a8f8fa2e57eb5b76a717f98506c5f4752c33da 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -44,9 +44,9 @@ module BrowseHelper
     t "printable_name.version", :version => object.version
   end
 
     t "printable_name.version", :version => object.version
   end
 

-  def element_strikethrough(object, &block)
+  def element_strikethrough(object, &)

     if object.redacted? || !object.visible?
     if object.redacted? || !object.visible?

-      tag.s(&block)
+      tag.s(&)

     else
       yield
     end
     else
       yield
     end


@@ -70,14 +70,14 @@ module BrowseHelper
     "nofollow" if object.tags.empty?
   end
 
     "nofollow" if object.tags.empty?
   end
 

-  def type_and_paginated_count(type, pages)
+  def type_and_paginated_count(type, pages, selected_page = pages.current_page)

     if pages.page_count == 1
       t ".#{type.pluralize}",
         :count => pages.item_count
     else
       t ".#{type.pluralize}_paginated",
     if pages.page_count == 1
       t ".#{type.pluralize}",
         :count => pages.item_count
     else
       t ".#{type.pluralize}_paginated",

-        :x => pages.current_page.first_item,
-        :y => pages.current_page.last_item,
+        :x => selected_page.first_item,
+        :y => selected_page.last_item,

         :count => pages.item_count
     end
   end
         :count => pages.item_count
     end
   end


@@ -86,21 +86,21 @@ module BrowseHelper
     max_width_for_default_padding = 35
 
     width = 0
     max_width_for_default_padding = 35
 
     width = 0

-    pagination_items(pages, {}).each do |body|
+    pagination_items(pages, {}).each do |(body)|

       width += 2 # padding width
       width += body.length
     end
     link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]
 
       width += 2 # padding width
       width += body.length
     end
     link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]
 

-    tag.ul :class => "pagination pagination-sm mb-1 ms-auto" do
-      pagination_items(pages, {}).each do |body, n|
-        linked = !(n.is_a? String)
+    tag.ul :class => "pagination pagination-sm mb-2" do
+      pagination_items(pages, {}).each do |body, page_or_class|
+        linked = !(page_or_class.is_a? String)

         link = if linked
         link = if linked

-                 link_to body, url_for(page_param => n), :class => link_classes
+                 link_to body, url_for(page_param => page_or_class.number), :class => link_classes, **yield(page_or_class)

                else
                  tag.span body, :class => link_classes
                end
                else
                  tag.span body, :class => link_classes
                end

-        concat tag.li link, :class => ["page-item", { n => !linked }]
+        concat tag.li link, :class => ["page-item", { page_or_class => !linked }]

       end
     end
   end
       end
     end
   end