Replace the existing pagination of changesets in the browser with a

simple next/previous pagination that avoids the need to count the total
number of matches.

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 7573a1803f52e54a3da136212ddc2f03113d1ad0..2834fdae9280a9e68e63b6c019b6385677d6b2c9 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -307,11 +307,15 @@ class ChangesetController < ApplicationController
       @description = t 'changeset.list.description'
     end
 
-    @edit_pages, @edits = paginate(:changesets,
-                                   :include => [:user, :changeset_tags],
-                                   :conditions => conditions,
-                                   :order => "changesets.created_at DESC",
-                                   :per_page => 20)
+    @page = (params[:page] || 1).to_i
+    @page_size = 20
+
+    @edits = Changeset.find(:all,
+                            :include => [:user, :changeset_tags],
+                            :conditions => conditions,
+                            :order => "changesets.created_at DESC",
+                            :offset => (@page - 1) * @page_size,
+                            :limit => @page_size)
   end
 
 private

diff --git a/app/views/changeset/_changeset_paging_nav.html.erb b/app/views/changeset/_changeset_paging_nav.html.erb
index 5a5d94f05d89a670a739111f0180517926dc5e18..7b99b60eaa422e9fa17cd9ca22f1a4b1563dcc5c 100644 (file)
--- a/app/views/changeset/_changeset_paging_nav.html.erb
+++ b/app/views/changeset/_changeset_paging_nav.html.erb
@@ -1,13 +1,17 @@
 <p>
-<% current_page = @edit_pages.current_page %>
-
-<%= t'changeset.changeset_paging_nav.showing_page' %> 
-<%= current_page.number %> (<%= current_page.first_item %><% 
-if (current_page.first_item < current_page.last_item) # if more than 1 changeset on page 
-  %>-<%= current_page.last_item %><% 
-end %>
-<%= t'changeset.changeset_paging_nav.of'%> <%= @edit_pages.item_count %>)
-<% if @edit_pages.page_count > 1 %>
- | <%= pagination_links_each(@edit_pages, {}) { |n| link_to(n, params.merge({ :page => n })) } %>
+
+<% if @page > 1 %>
+<%= link_to t('changeset.changeset_paging_nav.previous'), :page => @page - 1 %>
+<% else %>
+<%= t('changeset.changeset_paging_nav.previous') %>
 <% end %>
+
+| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> |
+
+<% if @edits.size < @page_size %>
+<%= t('changeset.changeset_paging_nav.next') %>
+<% else %>
+<%= link_to t('changeset.changeset_paging_nav.next'), :page => @page + 1 %>
+<% end %>
+
 </p>

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 28fe7163505a48647092648cc8ed3afb349ba57c..2077739f3dfa87617384c5ab370b15c2fbd4e0d4 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -199,9 +199,6 @@ af:
       no_comment: (geen)
       no_edits: (geen wysigings)
       still_editing: (steeds besig met wysiging)
-    changeset_paging_nav: 
-      of: van
-      showing_page: Wys bladsy
     changesets: 
       area: Gebied
       comment: Opmerking

diff --git a/config/locales/be.yml b/config/locales/be.yml
index bc79fe8421a5e2406b8180afcf0c788f364e9331..fdcaf66f07847f0eb120a2031d014807a3bd527a 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -188,9 +188,6 @@ be:
       show_area_box: паказаць мяжу мясцовасці
       still_editing: (у працэсе рэдагавання)
       view_changeset_details: Падрабязней пра набор зменаў
-    changeset_paging_nav: 
-      of: з
-      showing_page: Паказваецца старонка
     changesets: 
       area: Мясцовасць
       comment: Каментар

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 2eebd93d1afbe6b96e1559504b19dd2a3a694952..39fea764ab307f722ca6a42d0268973409475a4b 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -241,9 +241,6 @@ br:
       show_area_box: diskouez takad ar voest
       still_editing: (oc'h aozañ c'hoazh)
       view_changeset_details: Gwelet munudoù ar strollad kemmoù
-    changeset_paging_nav: 
-      of: eus
-      showing_page: O tiskouez ar bajenn
     changesets: 
       area: Takad
       comment: Addispleg

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f0977b628cb46037444cb7dd11f091a93609bfa4..7e6218d558b4894b45f6946f2a69fd650391c937 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -213,9 +213,6 @@ cs:
       no_comment: (žádný)
       still_editing: (stále se upravuje)
       view_changeset_details: Zobrazit detaily sady změn
-    changeset_paging_nav: 
-      of: z
-      showing_page: Zobrazuji stranu
     changesets: 
       area: Oblast
       comment: Komentář

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 51e3ff597476f68743db8b81fa7b02f543688081..0ffb590b98ca14c35e05a93c601209313b67db77 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -251,9 +251,6 @@ de:
       show_area_box: Bereich anzeigen
       still_editing: (in Bearbeitung)
       view_changeset_details: Details des Changesets
-    changeset_paging_nav: 
-      of: von
-      showing_page: Seite
     changesets: 
       area: Bereich
       comment: Kommentar

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 48965ab5cf8fe0c7808b4c8d2ddb7269c38e9bd2..806e06d643ef70ad90cdff683b2fa17cce3456ba 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -248,9 +248,6 @@ dsb:
       show_area_box: wobłuk pokazaś
       still_editing: (wobźěłujo se)
       view_changeset_details: Drobnostki sajźbow změnow pokazaś
-    changeset_paging_nav: 
-      of: z
-      showing_page: Pokazujo se bok
     changesets: 
       area: Wurězk
       comment: Komentar

diff --git a/config/locales/el.yml b/config/locales/el.yml
index bd3b2677d2a691ca9e13b550b279397ce4a8404c..e086bf5a5c3875449f9165d1ba1690c0ae109ded 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -186,8 +186,6 @@ el:
       anonymous: Ανόνυμος
       show_area_box: δείξε περιοχή κουτιού
       view_changeset_details: Δες αλλαγή συλλογής λεπτομερειών
-    changeset_paging_nav: 
-      showing_page: Eμφάνιση σελίδας
     changesets: 
       area: Περιοχή
       comment: Σχόλιο

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 159920ac1be2c1fc5665bef0cd6716523a2b7e33..e50ace42aee90526ef3ea75426d968421d9c1901 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -241,8 +241,9 @@ en:
       edit: "edit"
   changeset:
     changeset_paging_nav: 
-      showing_page: "Showing page"
-      of: "of"
+      showing_page: "Showing page {{page}}"
+      next: "Next »"
+      previous: "« Previous"
     changeset:
       id: "#{{id}}"
       still_editing: "(still editing)"

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 460cec79acadfd1c9911955387d5e07dba21a934..4ca92d2f7e409d7ea4fb264a3493643c6ab8ba72 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -222,8 +222,6 @@ eo:
       no_comment: (neniu)
       no_edits: (neniaj redaktoj)
       still_editing: (estas ankoraŭ redaktata)
-    changeset_paging_nav: 
-      showing_page: Montrante paĝon
     changesets: 
       area: Areo
       comment: Komento

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 959b01751a544642bd71ec5d366f129c25751755..63499879e1b657e01daf924872379dec40ebae3a 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -242,9 +242,6 @@ es:
       show_area_box: mostrar caja
       still_editing: (todavía en edición)
       view_changeset_details: Ver detalles del conjunto de cambios
-    changeset_paging_nav: 
-      of: de
-      showing_page: Mostrando página
     changesets: 
       area: Ã\81rea
       comment: Comentario

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 9f90d0d9f584460a5bbdb8b68102cb5c8ff81e17..9c22569ab7627f787b9a47420e085d7f07b367c2 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -225,9 +225,6 @@ fi:
       show_area_box: näytä alueen rajat kartalla
       still_editing: (muokkaus kesken)
       view_changeset_details: Näytä muutoskokoelman tarkemmat tiedot
-    changeset_paging_nav: 
-      of: " /"
-      showing_page: Sivu
     changesets: 
       area: Alue
       comment: Kommentti

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e9b3e1bf0dff237cb2f8df7d839a7e798d8b9aeb..83eaf9a3fdf4ac8a0efd9002f31e1ed62d6d8a3e 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -246,9 +246,6 @@ fr:
       show_area_box: afficher la zone de la boîte
       still_editing: (en cours de modification)
       view_changeset_details: Afficher les détails du groupe de modifications
-    changeset_paging_nav: 
-      of: de
-      showing_page: Affichage de la page
     changesets: 
       area: Zone
       comment: Commentaire

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index ad58e06388fb6bcb211f48984901855c8c146b2a..f81cf8bea65c61bb06eda5c4ffa260c3a54b42c5 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -167,9 +167,6 @@ fur:
       no_edits: (nissun cambiament)
       still_editing: (ancjemò in cambiament)
       view_changeset_details: Viôt detais dal grup di cambiaments
-    changeset_paging_nav: 
-      of: su
-      showing_page: Daûr a mostrâ la pagjine
     changesets: 
       area: Aree
       comment: Coment

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 87a280cdace39f74d01c0f5325ec4cdb62240560..c6c3ee2a6d3a3d769819ab647f460a82ba805c0e 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -174,9 +174,6 @@ hi:
       no_edits: (कोई संपादित नहीं है)
       still_editing: (संपादित किया जा रहा है)
       view_changeset_details: इस changeset के विवरण देखे
-    changeset_paging_nav: 
-      of: "पृष्ठ गिनती:"
-      showing_page: "इस पृष्ठ का प्रदर्शन:"
     changesets: 
       area: क्षेत्र
       comment: टिप्पणी

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index cd7f4c5c5aa69bafab283070ea9d3eac8a2f9a41..8f2284236adcd744b3f48305b7e89e2b458718ec 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -246,9 +246,6 @@ hr:
       show_area_box: prikaži okvir područja
       still_editing: (još uređuje)
       view_changeset_details: Prikaži detalje changeseta
-    changeset_paging_nav: 
-      of: od
-      showing_page: Prikazujem stranicu
     changesets: 
       area: Područje
       comment: Komentar

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 5d067e023ca32765f070d4240dfdcc404e07b0d3..72249a7a2003a79e3a4e5b16c6f9d598b970161f 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -248,9 +248,6 @@ hsb:
       show_area_box: wobłuk pokazać
       still_editing: (wobdźěłuje so hišće)
       view_changeset_details: Podrobnosće sadźby změnow pokazać
-    changeset_paging_nav: 
-      of: z
-      showing_page: Pokazuje so strona
     changesets: 
       area: Wobłuk
       comment: Komentar

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index ca87bc731973daf103b5498826d19c42e48c5b40..a223e4246a5a7ef31c339a8ff265f323baf97f43 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -243,9 +243,6 @@ hu:
       show_area_box: területhatároló megjelenítése
       still_editing: (szerkesztés alatt)
       view_changeset_details: Módosításcsomag részleteinek megtekintése
-    changeset_paging_nav: 
-      of: "összesen:"
-      showing_page: "Jelenlegi oldal:"
     changesets: 
       area: Terület
       comment: Megjegyzés

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 7ac46e009ae38644e508e907705b134808d89735..e6e5b19b2f8e332510c071dbd59428ffc54a9793 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -240,9 +240,6 @@ ia:
       show_area_box: monstrar quadro del area
       still_editing: (ancora in modification)
       view_changeset_details: Vider detalios del gruppo de modificationes
-    changeset_paging_nav: 
-      of: de
-      showing_page: Monstrante pagina
     changesets: 
       area: Area
       comment: Commento

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 252971ffdd012af6e247a0d8bf326a5f1fed0c72..5411411fb4f478648317bc34a9f8e06d1ae5fec8 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -238,9 +238,6 @@ is:
       show_area_box: sýna svæðismörk
       still_editing: (enn að breyta)
       view_changeset_details: Skoða breytingarsett
-    changeset_paging_nav: 
-      of: af
-      showing_page: Sýni síðu
     changesets: 
       area: Svæði
       comment: Athugasemd

diff --git a/config/locales/it.yml b/config/locales/it.yml
index b3947e85a55e3371c78a9bc16810f849558b0b2f..10fee541575c672da67f947a3ea85dee5b25adcc 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -177,9 +177,6 @@ it:
       show_area_box: visualizza il riquadro dell'area
       still_editing: (ancora in modifica)
       view_changeset_details: Visualizza i dettagli del gruppo di modifiche
-    changeset_paging_nav: 
-      of: di
-      showing_page: Visualizzata la pagina
     changesets: 
       area: Area
       comment: Commento

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f29bdd00c479579545423ba4771bca7553a33462..1f8505cbb2f3aff8356e37a537d018461d67a93e 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -230,8 +230,6 @@ ja:
       show_area_box: 領域境界を表示
       still_editing: （まだ編集中です）
       view_changeset_details: 変更セットの詳細表示
-    changeset_paging_nav: 
-      showing_page: ページ表示
     changesets: 
       area: 領域
       comment: コメント

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 5bb7e9ad2ba96dacc1170518ad361459261133b8..7277158193c542a2ef93bbb60f8f75312ddc512a 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -240,9 +240,6 @@ mk:
       show_area_box: прикажи рамка на површина
       still_editing: (сè уште уредува)
       view_changeset_details: Преглед на детали од измените
-    changeset_paging_nav: 
-      of: од
-      showing_page: Приказ на страница
     changesets: 
       area: Површина
       comment: Коментар

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index af6e573859fffc5d2f3d298c8caef3f84870851d..6a508e03d54457ff17519194cd72e659d055f994 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -138,9 +138,6 @@ nds:
       no_comment: (keen)
       no_edits: (keen Ännern)
       still_editing: (noch an’t Ännern)
-    changeset_paging_nav: 
-      of: von
-      showing_page: an’t Sied weddergeven
     changesets: 
       area: Rebeed
       comment: Kommentar

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 26158191ac7a268619d9c100ac96ce577c717e00..fdf60fb6187090c1d135ff6fad8d4c211e10b7e0 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -242,9 +242,6 @@ nl:
       show_area_box: toon rechthoek
       still_editing: (nog aan het bewerken)
       view_changeset_details: Details wijzigingenset weergeven
-    changeset_paging_nav: 
-      of: van
-      showing_page: Bezig met weergeven van pagina
     changesets: 
       area: Gebied
       comment: Opmerking

diff --git a/config/locales/no.yml b/config/locales/no.yml
index 390c536ac85659386dc813ee203044f70df98f4a..f55b08f934a56c1c733fabcb33b43bcb26126473 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -237,9 +237,6 @@
       show_area_box: vis boks for område
       still_editing: (redigerer forsatt)
       view_changeset_details: Vis detaljer for endringssett
-    changeset_paging_nav: 
-      of: av
-      showing_page: Viser side
     changesets: 
       area: Område
       comment: Kommentar

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 501c9eee60e8c1ca72cc9184d040acbcfce3a71e..6570f2b91b8fec357aaaeb6b51abcfbbd21876e5 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -236,9 +236,6 @@ pl:
       show_area_box: pokaż prostokąt zawierający
       still_editing: (nadal edytowany)
       view_changeset_details: Zobacz szczegóły changesetu
-    changeset_paging_nav: 
-      of: z
-      showing_page: Widoczna jest strona
     changesets: 
       area: Obszar
       comment: Komentarz

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 63b9bad0aa5fc6075d741617ac891aa240d1f623..c58b8aa8e21295fce9bd1fcd7d23a3f303fb1878 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -244,9 +244,6 @@ pt-BR:
       show_area_box: exibir limite da área
       still_editing: (ainda editando)
       view_changeset_details: Ver detalhes das alterações
-    changeset_paging_nav: 
-      of: de
-      showing_page: Exibindo página
     changesets: 
       area: Área
       comment: Comentário

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 2acbea2381d1c221581d24e9fefbb30fa4af0092..965d5351cc2be5898c53651c8e142fe37b0356cb 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -210,9 +210,6 @@ ro:
       show_area_box: afișează chenarul zonei
       still_editing: (încă se editează)
       view_changeset_details: Vizualizare detalii set de schimbări
-    changeset_paging_nav: 
-      of: din
-      showing_page: Se afișează pagina
     changesets: 
       area: Zonă
       comment: Comentariu

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index a1f7104468705da41d55cb2356baac1ddc5fc6f4..fb54a36b8d08a5a52abc2036b17e864e0ea015fb 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -242,9 +242,6 @@ ru:
       show_area_box: Показать рамку, охватывающую область пакета правок
       still_editing: (ещё редактируется)
       view_changeset_details: Просмотреть подробности пакета правок
-    changeset_paging_nav: 
-      of: из
-      showing_page: Страница
     changesets: 
       area: Область
       comment: Комментарий

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 70ab615b82e5f1c3e89fa1c61d08e70efd46a780..6a67387b11b5ff99428c231dc4539657e2d45b05 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -212,9 +212,6 @@ sl:
       show_area_box: prikaži pravokotno področje
       still_editing: (še ureja)
       view_changeset_details: Ogled podrobnosti paketa sprememb
-    changeset_paging_nav: 
-      of: od
-      showing_page: Prikaz strani
     changesets: 
       area: Področje
       comment: Komentar

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 4447a97901bbe9465c2e70ef499db437bac5416e..aebe07a21be8f62e0f4bb091f02623b85bd6d5ca 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -233,9 +233,6 @@ sv:
       no_comment: (ingen)
       no_edits: (inga ändringar)
       still_editing: (redigerar fortfarande)
-    changeset_paging_nav: 
-      of: av
-      showing_page: Visar sida
     changesets: 
       area: Area
       comment: Kommentar

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 29ae03ee3de5f9308d36175161b161c121a39a96..afca8e75b1e6b02084bebb6c7c1393936e8513bc 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -240,9 +240,6 @@ vi:
       show_area_box: hiện hộp vùng
       still_editing: (đang mở)
       view_changeset_details: Xem chi tiết của bộ thay đổi
-    changeset_paging_nav: 
-      of: trong
-      showing_page: Đang hiện trang
     changesets: 
       area: Vùng
       comment: Miêu tả

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 09bc531762cd1d6de439add85d0ea294b830be02..eb5e0f51f669e549189914341a3f3e41e0869c15 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -172,8 +172,6 @@ zh-CN:
       show_area_box: 显示区域窗口
       still_editing: (仍在编辑中)
       view_changeset_details: 查看详细变更
-    changeset_paging_nav: 
-      showing_page: 显示网页
     changesets: 
       area: 区域
       comment: 评论

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 538265aa9dfb30c527ccd6633cb5ee262888b3c3..78bf0d53988e4f8974fdb97384d9068ad1d8c340 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -227,9 +227,6 @@ zh-TW:
       show_area_box: 顯示區域方塊
       still_editing: (尚在編輯)
       view_changeset_details: 檢視變更組合詳細資訊
-    changeset_paging_nav: 
-      of: ／
-      showing_page: 正在顯示頁面
     changesets: 
       area: 區域
       comment: 註解