Keep :f filter on /org_admin/templates/ "View All"

This commit retains the selected 'Published', 'Unpublished', or 'Not customized' filter when using the "Select All" pagination option on the paths /org_admin/templates, org_admin/templates/organisational, and org_admin/templates/customisable. Previously, clicking "Select All" would ignore the filter and return all templates.

Author: aaronskiba

app/controllers/concerns/paginable.rb

@@ -99,6 +99,8 @@ def paginable_base_url(page = 1)
       action: @args[:action],
       page: page
     )
+    # Retain :f if paginable/templates controller is using it to filter templates
+    url_params[:f] = @args[:f] if @args[:f].present? && @args[:controller] == 'paginable/templates'
     url_for(url_params)
   end
 

app/controllers/paginable/templates_controller.rb

@@ -25,7 +25,7 @@ def index
       paginable_renderise(
         partial: 'index',
         scope: templates,
-        query_params: { sort_field: 'templates.title', sort_direction: :asc },
+        query_params: { sort_field: 'templates.title', sort_direction: :asc, f: params[:f] },
         locals: { action: 'index' },
         format: :json
       )
@@ -50,7 +50,7 @@ def organisational
       paginable_renderise(
         partial: 'organisational',
         scope: templates,
-        query_params: { sort_field: 'templates.title', sort_direction: :asc },
+        query_params: { sort_field: 'templates.title', sort_direction: :asc, f: params[:f] },
         locals: { action: 'organisational' },
         format: :json
       )
@@ -78,7 +78,7 @@ def customisable
       paginable_renderise(
         partial: 'customisable',
         scope: templates.joins(:org).includes(:org),
-        query_params: { sort_field: 'templates.title', sort_direction: :asc },
+        query_params: { sort_field: 'templates.title', sort_direction: :asc, f: params[:f] },
         locals: { action: 'customisable', customizations: customizations },
         format: :json
       )