Merge branch 'main' of github.com:next-l/enju_leaf

Author: nabeta

Diff for: app/controllers/checkouts_controller.rb

@@ -178,10 +178,4 @@ def check_policy
   def checkout_params
     params.fetch(:checkout, {}).permit(:due_date)
   end
-
-  def filtered_params
-    params.permit([:user_id, :days_overdue, :reserved])
-  end
-
-  helper_method :filtered_params
 end

Diff for: app/controllers/concerns/enju_library/controller.rb

@@ -8,7 +8,6 @@ module Controller
       rescue_from Pundit::NotAuthorizedError, with: :render_403
       # rescue_from ActiveRecord::RecordNotFound, with: :render_404
       # rescue_from ActionView::MissingTemplate, with: :render_404_invalid_format
-      helper_method :filtered_params
     end
 
     private
@@ -246,10 +245,6 @@ def get_subscription
       end
     end
 
-    def filtered_params
-      params.permit([:q, :query, :view, :format, :order, :sort_by, :page, :per_page])
-    end
-
     class InvalidLocaleError < StandardError
     end
   end

Diff for: app/controllers/events_controller.rb

@@ -160,10 +160,4 @@ def event_params
   def prepare_options
     @event_categories = EventCategory.all
   end
-
-  def filtered_params
-    params.permit([:format, :library_id, :mode, :query, :page, :per_page])
-  end
-
-  helper_method :filtered_params
 end

Diff for: app/controllers/messages_controller.rb

@@ -166,10 +166,4 @@ def get_parent(id)
       end
     end
   end
-
-  def filtered_params
-    params.permit([:view, :format, :page, :mode, :sort_by, :per_page])
-  end
-
-  helper_method :filtered_params
 end

Diff for: app/controllers/reserves_controller.rb

@@ -298,10 +298,4 @@ def reserve_update_params
   def prepare_options
     @libraries = Library.real.order(:position)
   end
-
-  def filtered_params
-    params.permit([:user_id, :reserved_from, :reserved_until, :query, :sort_by, :state])
-  end
-
-  helper_method :filtered_params
 end

Diff for: app/helpers/checkouts_helper.rb

@@ -0,0 +1,5 @@
+module CheckoutsHelper
+  def filtered_params
+    params.permit([:user_id, :days_overdue, :reserved])
+  end
+end

Diff for: app/helpers/events_helper.rb

@@ -0,0 +1,5 @@
+module EventsHelper
+  def filtered_params
+    params.permit([:format, :library_id, :mode, :query, :page, :per_page])
+  end
+end

Diff for: app/helpers/libraries_helper.rb

@@ -0,0 +1,5 @@
+module LibrariesHelper
+  def filtered_params
+    params.permit([:q, :query, :view, :format, :order, :sort_by, :page, :per_page])
+  end
+end

Diff for: app/helpers/messages_helper.rb

@@ -1,2 +1,5 @@
 module MessagesHelper
+  def filtered_params
+    params.permit([:view, :format, :page, :mode, :sort_by, :per_page])
+  end
 end

Diff for: app/helpers/reserves_helper.rb

@@ -18,4 +18,8 @@ def i18n_state(state)
       t('reserve.completed')
     end
   end
+
+  def filtered_params
+    params.permit([:user_id, :reserved_from, :reserved_until, :query, :sort_by, :state])
+  end
 end

Diff for: app/views/checkouts/_index_overdue.html.erb

@@ -27,12 +27,12 @@
   <h4><%= t('page.other_format') %></h4>
   <ul>
     <li>
-      <%= link_to 'RSS', url_for(filtered_params.merge(format: :rss, days_overdue: params[:days_overdue])) -%>
-      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), url_for(filtered_params.merge(format: :rss, days_overdue: params[:days_overdue])) -%>
+      <%= link_to 'RSS', url_for(filtered_params.merge(only_path: true, format: :rss, days_overdue: params[:days_overdue])) -%>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), url_for(filtered_params.merge(only_path: true, format: :rss, days_overdue: params[:days_overdue])) -%>
     </li>
     <li>
-      <%= link_to 'TSV', url_for(filtered_params.merge(format: :txt, days_overdue: params[:days_overdue], locale: @locale.to_s)) -%>
-      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(format: :txt, days_overdue: params[:days_overdue], locale: @locale.to_s)) -%>
+      <%= link_to 'TSV', url_for(filtered_params.merge(only_path: true, format: :txt, days_overdue: params[:days_overdue], locale: @locale.to_s)) -%>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(only_path: true, format: :txt, days_overdue: params[:days_overdue], locale: @locale.to_s)) -%>
     </li>
   </ul>
 </div>

Diff for: app/views/events/index.html.erb

@@ -22,17 +22,17 @@
   <p>
     <%- case params[:mode]
       when 'upcoming' -%>
-      <%= link_to t('event.all'), url_for(filtered_params.merge(mode: nil, only_path: true)) -%>
+      <%= link_to t('event.all'), url_for(filtered_params.merge(only_path: true, mode: nil, only_path: true)) -%>
       <strong><%= t('event.upcoming') -%></strong>
-      <%= link_to t('event.past'), url_for(filtered_params.merge(mode: 'past', only_path: true)) -%>
+      <%= link_to t('event.past'), url_for(filtered_params.merge(only_path: true, mode: 'past', only_path: true)) -%>
     <%- when 'past' -%>
-      <%= link_to t('event.all'), url_for(filtered_params.merge(mode: nil, only_path: true)) -%>
-      <%= link_to t('event.upcoming'), url_for(filtered_params.merge(mode: 'upcoming', only_path: true)) -%>
+      <%= link_to t('event.all'), url_for(filtered_params.merge(only_path: true, mode: nil, only_path: true)) -%>
+      <%= link_to t('event.upcoming'), url_for(filtered_params.merge(only_path: true, mode: 'upcoming', only_path: true)) -%>
       <strong><%= t('event.past') -%></strong>
     <%- else -%>
       <strong><%= t('event.all') -%></strong>
-      <%= link_to t('event.upcoming'), url_for(filtered_params.merge(mode: 'upcoming', only_path: true)) -%>
-      <%= link_to t('event.past'), url_for(filtered_params.merge(mode: 'past', only_path: true)) -%>
+      <%= link_to t('event.upcoming'), url_for(filtered_params.merge(only_path: true, mode: 'upcoming', only_path: true)) -%>
+      <%= link_to t('event.past'), url_for(filtered_params.merge(only_path: true, mode: 'past', only_path: true)) -%>
     <%- end -%>
   </p>
 
@@ -77,9 +77,9 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <% if params[:mode] == 'calendar' %>
-      <li><%= link_to t('event.table'), url_for(filtered_params.merge(mode: nil)) -%></li>
+      <li><%= link_to t('event.table'), url_for(filtered_params.merge(only_path: true, mode: nil)) -%></li>
     <% else %>
-      <li><%= link_to t('event.calendar'), url_for(filtered_params.merge(mode: 'calendar')) -%></li>
+      <li><%= link_to t('event.calendar'), url_for(filtered_params.merge(only_path: true, mode: 'calendar')) -%></li>
     <% end %>
   </ul>
   <ul>
@@ -95,28 +95,28 @@
     <%- end -%>
   </ul>
   <ul>
-    <li><%= link_to t('event.all_libraries'), url_for(filtered_params.merge(library_id: nil, page: nil)) -%></li>
+    <li><%= link_to t('event.all_libraries'), url_for(filtered_params.merge(only_path: true, library_id: nil, page: nil)) -%></li>
     <%- @libraries.each do |library| -%>
-      <li><%= link_to library.display_name.localize, url_for(filtered_params.merge(library_id: library.name, mode: params[:mode])) -%></li>
+      <li><%= link_to library.display_name.localize, url_for(filtered_params.merge(only_path: true, library_id: library.name, mode: params[:mode])) -%></li>
     <%- end -%>
   </ul>
   <p>
     <%- if @library -%>
-      <%= link_to (image_tag 'icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(library_id: @library.name, format: :rss, page: nil)) -%>
-      (<%= link_to 'RSS', url_for(filtered_params.merge(library_id: @library.name, format: :rss, page: nil)) -%>)
-      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(library_id: @library.name, format: :txt, locale: @locale.to_s)) -%>
-      (<%= link_to 'TSV', url_for(filtered_params.merge(library_id: @library.name, format: :txt, locale: @locale.to_s)) -%>)
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(only_path: true, library_id: @library.name, format: :rss, page: nil)) -%>
+      (<%= link_to 'RSS', url_for(filtered_params.merge(only_path: true, library_id: @library.name, format: :rss, page: nil)) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(only_path: true, library_id: @library.name, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', url_for(filtered_params.merge(only_path: true, library_id: @library.name, format: :txt, locale: @locale.to_s)) -%>)
       <br />
-      <%= link_to (image_tag 'icons/calendar.png', size: '16x16', class: 'enju_icon', alt: 'iCalendar'), url_for(filtered_params.merge(library_id: @library.name, format: :ics, locale: @locale.to_s)) -%>
-      (<%= link_to 'iCalendar', url_for(filtered_params.merge(library_id: @library.name, format: :ics, locale: @locale.to_s)) -%>)
+      <%= link_to (image_tag 'icons/calendar.png', size: '16x16', class: 'enju_icon', alt: 'iCalendar'), url_for(filtered_params.merge(only_path: true, library_id: @library.name, format: :ics, locale: @locale.to_s)) -%>
+      (<%= link_to 'iCalendar', url_for(filtered_params.merge(only_path: true, library_id: @library.name, format: :ics, locale: @locale.to_s)) -%>)
     <%- else -%>
-      <%= link_to (image_tag 'icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(format: :rss)) -%>
-      (<%= link_to 'RSS', url_for(filtered_params.merge(format: :rss)) -%>)
-      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(format: :txt, locale: @locale.to_s)) -%>
-      (<%= link_to 'TSV', url_for(filtered_params.merge(format: :txt, locale: @locale.to_s)) -%>)
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(only_path: true, format: :rss)) -%>
+      (<%= link_to 'RSS', url_for(filtered_params.merge(only_path: true, format: :rss)) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(only_path: true, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', url_for(filtered_params.merge(only_path: true, format: :txt, locale: @locale.to_s)) -%>)
       <br />
-      <%= link_to (image_tag 'icons/calendar.png', size: '16x16', class: 'enju_icon', alt: 'iCalendar'), url_for(filtered_params.merge(format: :ics, locale: @locale.to_s)) -%>
-      (<%= link_to 'iCalendar', url_for(filtered_params.merge(format: :ics, locale: @locale.to_s)) -%>)
+      <%= link_to (image_tag 'icons/calendar.png', size: '16x16', class: 'enju_icon', alt: 'iCalendar'), url_for(filtered_params.merge(only_path: true, format: :ics, locale: @locale.to_s)) -%>
+      (<%= link_to 'iCalendar', url_for(filtered_params.merge(only_path: true, format: :ics, locale: @locale.to_s)) -%>)
     <%- end -%>
   </p>
 </div>

Diff for: app/views/reserves/index.html.erb

@@ -103,15 +103,15 @@
 
   <p>
     <%- if @user -%>
-      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(user_id: @user.username, format: :rss)) -%>
-      (<%= link_to 'RSS', url_for(filtered_params.merge(user_id: @user.username, format: :rss)) -%>)
-      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(user_id: @user.username, format: :txt, locale: @locale.to_s)) -%>
-      (<%= link_to 'TSV', url_for(filtered_params.merge(user_id: @user.username, format: :txt, locale: @locale.to_s)) -%>)
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(only_path: true, user_id: @user.username, format: :rss)) -%>
+      (<%= link_to 'RSS', url_for(filtered_params.merge(only_path: true, user_id: @user.username, format: :rss)) -%>)
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(only_path: true, user_id: @user.username, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', url_for(filtered_params.merge(only_path: true, user_id: @user.username, format: :txt, locale: @locale.to_s)) -%>)
     <%- else -%>
-      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(format: :rss)) -%>
-      (<%= link_to 'RSS', url_for(filtered_params.merge(format: :rss)) -%>)
-      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(format: :txt, locale: @locale.to_s)) -%>
-      (<%= link_to 'TSV', url_for(filtered_params.merge(format: :txt, locale: @locale.to_s)) -%>)
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(only_path: true, format: :rss)) -%>
+      (<%= link_to 'RSS', url_for(filtered_params.merge(only_path: true, format: :rss)) -%>)
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(only_path: true, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', url_for(filtered_params.merge(only_path: true, format: :txt, locale: @locale.to_s)) -%>)
     <%- end -%>
   </p>
 </div>