Merge pull request #337 from linuxfrorg/filter_get

Oumph · web-flow · commit 22b23566e850 · 2022-11-11T21:21:29.000+01:00
Fix #2042 filter params for pagination
diff --git a/app/helpers/node_helper.rb b/app/helpers/node_helper.rb
@@ -58,6 +58,17 @@ def link_to_content(content)
     link_to content.title, path_for_content(content)
   end
 
+  def filter_pagination_params(allowed_params)
+    allowed_params += ['action', 'controller']
+    params.each do |k,v|
+      if allowed_params.include?(k)
+        params[k] = v
+      else
+        params[k] = nil
+      end
+    end
+  end
+
   def paginated_nodes(nodes, link=nil)
     paginated_section(nodes, link) do
       content_tag(:main, render(nodes.map &:content), id: 'contents', role: 'main')
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
@@ -84,4 +84,5 @@
           = button_to "Animateur", admin_account_editor_path(account.id), class: "change_role"
           = button_to "Admin", admin_account_admin_path(account.id), class: "change_role"
 
+- filter_pagination_params ['login', 'date', 'ip', 'email', 'inactive', 'page']
 = paginate @accounts
diff --git a/app/views/admin/applications/index.html.haml b/app/views/admin/applications/index.html.haml
@@ -16,4 +16,5 @@
         = link_to "Modifier", edit_admin_application_path(app), class: "edit_client_app"
         = button_to "Supprimer", admin_application_path(app), method: :delete, class: "delete_button", data: { confirm: "Confirmez‑vous vouloir supprimer cette application ?" }
 
+- filter_pagination_params ['page']
 = paginate @applications
diff --git a/app/views/bookmarks/index.html.haml b/app/views/bookmarks/index.html.haml
@@ -1,4 +1,5 @@
 =h1 "Les liens"
 - feed "Flux Atom des liens"
 - new_content_link = link_to("Partager un lien", "/liens/nouveau") if current_account
+- filter_pagination_params ['order', 'page']
 = paginated_nodes @nodes, new_content_link
diff --git a/app/views/diaries/index.html.haml b/app/views/diaries/index.html.haml
@@ -1,4 +1,5 @@
 =h1 "Les journaux"
 - feed "Flux Atom des journaux"
 - new_content_link = link_to("Écrire un journal", "/journaux/nouveau") if current_account
+- filter_pagination_params ['order', 'page']
 = paginated_nodes @nodes, new_content_link
diff --git a/app/views/forums/index.html.haml b/app/views/forums/index.html.haml
@@ -4,4 +4,5 @@
 =h1 "Les forums"
 - feed "Flux Atom des forums"
 - new_content_link = link_to("Poster dans les forums", "/posts/nouveau") if current_account
+- filter_pagination_params ['order', 'page']
 = paginated_nodes @nodes, new_content_link
diff --git a/app/views/forums/show.html.haml b/app/views/forums/show.html.haml
@@ -4,4 +4,5 @@
 =h1 "Les messages du forum #{@forum.title}"
 - feed "Flux Atom du forum #{@forum.title}", "/forums/#{@forum.to_param}.atom"
 - new_content_link = link_to("Poster dans les forums", controller: 'posts', action: 'new', forum_id: @forum.id) if current_account
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_contents @posts, new_content_link
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
@@ -13,6 +13,7 @@
   - if @banner
     %aside.banner
       = @banner
+  - filter_pagination_params ['order', 'page']
   = paginated_section @nodes, link_to("Proposer une dépêche", "/news/nouveau") do
     %main#contents(role="main")
       = render @nodes.map(&:content)
diff --git a/app/views/news/calendar.html.haml b/app/views/news/calendar.html.haml
@@ -1,2 +1,3 @@
 = h1 "Les dépêches du #{@day}/#{@month}/#{@year}"
+- filter_pagination_params ['day', 'month', 'order', 'page', 'year']
 = paginated_nodes @nodes, link_to("Proposer une dépêche", "/news/nouveau")
diff --git a/app/views/news/index.html.haml b/app/views/news/index.html.haml
@@ -1,3 +1,4 @@
 = h1 "Les dépêches"
 - feed "Flux Atom des dépêches"
+- filter_pagination_params ['order', 'page']
 = paginated_nodes @nodes, link_to("Proposer une dépêche", "/news/nouveau")
diff --git a/app/views/polls/index.html.haml b/app/views/polls/index.html.haml
@@ -1,4 +1,5 @@
 =h1 "Les sondages"
 - feed "Flux Atom des sondages"
 - new_content_link = link_to("Proposer un sondage", "/sondages/nouveau") if current_account
+- filter_pagination_params ['order', 'page']
 = paginated_contents @polls, new_content_link
diff --git a/app/views/readings/index.html.haml b/app/views/readings/index.html.haml
@@ -4,6 +4,7 @@
     = button_to "Tout oublier", readings_path, method: :delete, class: "delete_button"
 
 =h1 "Les derniers contenus que j’ai lus"
+- filter_pagination_params ['order', 'page']
 = paginated_section @nodes do
   %main#contents(role="main")
     = render @nodes.map(&:content)
diff --git a/app/views/sections/show.html.haml b/app/views/sections/show.html.haml
@@ -3,4 +3,5 @@
 
 =h1 @section.title
 - feed "Flux Atom des dépêches de « #{@section.title} »"
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_contents @news, link_to("Proposer une dépêche", "/news/nouveau")
diff --git a/app/views/tags/index.html.haml b/app/views/tags/index.html.haml
@@ -3,6 +3,7 @@
 = render "hide"
 
 =h1 "Tous les contenus que j’ai étiquetés"
+- filter_pagination_params ['order', 'page']
 = paginated_section @nodes do
   %main#contents(role="main")
     = render @nodes.map(&:content)
diff --git a/app/views/tags/public.html.haml b/app/views/tags/public.html.haml
@@ -5,6 +5,7 @@
 =h1 "Tous les contenus étiquetés avec « #{@tag.name} »"
 - feed "Flux Atom étiquette « #{@tag.name} »"
 - link = link_to("Afficher uniquement les contenus que j’ai étiquetés avec « #{@tag.name} »", tag_path(@tag.name)) if current_account
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_section @nodes, link do
   %main#contents(role="main")
     = render @nodes.map(&:content)
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
@@ -5,6 +5,7 @@
 
 =h1 "Tous les contenus que j’ai étiquetés avec « #{@tag.name} »"
 - link = link_to("Afficher tous les contenus étiquetés avec « #{@tag.name} »", public_tag_path(@tag.name))
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_section @nodes, link do
   %main#contents(role="main")
     = render @nodes.map(&:content)
diff --git a/app/views/trackers/index.html.haml b/app/views/trackers/index.html.haml
@@ -62,4 +62,5 @@
               = link_to "Modifier", "/suivi/#{tracker.to_param}/modifier"
             - else
               &nbsp;
+    - filter_pagination_params ['order', 'page']
     = paginate @trackers
diff --git a/app/views/users/comments.html.haml b/app/views/users/comments.html.haml
@@ -8,6 +8,7 @@
   %style{type: "text/css"}
     \.toolbox .pagination { display: block }
   %nav.toolbox
+    - filter_pagination_params ['id', 'page']
     = paginate @comments
   %div#comments
     %ul.threads
diff --git a/app/views/users/journaux.html.haml b/app/views/users/journaux.html.haml
@@ -4,4 +4,5 @@
 
 =h1 "#{@user.name} a écrit #{pluralize @nodes.total_count, "journal", "journaux"}"
 - feed "Flux Atom des journaux de #{@user.name}"
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_nodes @nodes
diff --git a/app/views/users/liens.html.haml b/app/views/users/liens.html.haml
@@ -4,4 +4,5 @@
 
 =h1 "#{@user.name} a partagé #{pluralize @nodes.total_count, "lien"}"
 - feed "Flux Atom des liens de #{@user.name}"
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_nodes @nodes
diff --git a/app/views/users/news.html.haml b/app/views/users/news.html.haml
@@ -4,4 +4,5 @@
 
 =h1 "#{@user.name} a écrit #{pluralize @nodes.total_count, "dépêche"}"
 - feed "Flux Atom des dépêches de #{@user.name}"
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_nodes @nodes
diff --git a/app/views/users/posts.html.haml b/app/views/users/posts.html.haml
@@ -4,4 +4,5 @@
 
 =h1 "#{@user.name} a écrit #{pluralize @nodes.total_count, "message"} dans les forums"
 - feed "Flux Atom des messages de #{@user.name} dans les forums"
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_nodes @nodes
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -4,4 +4,5 @@
 
 =h1 "#{@user.name} a écrit #{pluralize @nodes.total_count, "contenu"} de type dépêche ou journal"
 - feed "Flux Atom de #{@user.name}", "/users/#{@user.to_param}.atom"
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_nodes @nodes
diff --git a/app/views/users/suivi.html.haml b/app/views/users/suivi.html.haml
@@ -3,4 +3,5 @@
   = render 'nodes'
 
 =h1 "#{@user.name} a écrit #{pluralize @nodes.total_count, "entrée"} sur le suivi"
+- filter_pagination_params ['id', 'order', 'page']
 = paginated_nodes @nodes
diff --git a/app/views/users/wiki.html.haml b/app/views/users/wiki.html.haml
@@ -4,6 +4,7 @@
 
 %main#contents(role="main")
   =h1 "Les participations de #{@user.name} au wiki"
+  - filter_pagination_params ['id', 'page']
   = paginate @versions
   %ul.changes
     = list_of(@versions) do |v|
diff --git a/app/views/wiki_pages/changes.html.haml b/app/views/wiki_pages/changes.html.haml
@@ -3,6 +3,7 @@
   - feed "Flux Atom des derniers changements du wiki"
 
   %nav.toolbox
+    - filter_pagination_params ['page']
     = paginate @versions
   %ul.changes
     = list_of(@versions) do |v|
diff --git a/app/views/wiki_pages/pages.html.haml b/app/views/wiki_pages/pages.html.haml
@@ -1,4 +1,5 @@
 =h1 "Les pages du wiki"
 - feed "Flux Atom du wiki", "/wiki.atom"
 - new_content_link = link_to("Écrire une page de wiki", "/wiki/nouveau") if current_account
+- filter_pagination_params ['order', 'page']
 = paginated_nodes @nodes, new_content_link

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`= h1 "Les dépêches du #{@day}/#{@month}/#{@year}"`
	`2`	`+- filter_pagination_params ['day', 'month', 'order', 'page', 'year']`
`2`	`3`	`= paginated_nodes @nodes, link_to("Proposer une dépêche", "/news/nouveau")`