cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/4565'

Browse source
This commit is contained in:
Tom Hughes 2024-08-28 18:59:09 +01:00
commit 5f2a5cadcb
8 changed files with 132 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/classic_pagination/pagination_helper.rb
View file

@ -145,7 +145,7 @@ module ActionView
items = []
if always_show_anchors && !(wp_first = window_pages[0]).first?
items.push [first.number.to_s, first.number]
items.push [first.number.to_s, first]
items.push ["...", "disabled"] if wp_first.number - first.number > 1
end
@ -153,13 +153,13 @@ module ActionView
if current_page == page && !link_to_current_page
items.push [page.number.to_s, "active"]
else
items.push [page.number.to_s, page.number]
items.push [page.number.to_s, page]
end
end
if always_show_anchors && !(wp_last = window_pages[-1]).last?
items.push ["...", "disabled"] if last.number - wp_last.number > 1
items.push [last.number.to_s, last.number]
items.push [last.number.to_s, last]
end
items