Fix various issues with the code

GratefulGarmentProject · Jun 27, 2024 · 7fe28a9 · 7fe28a9
1 parent 2d7dbb4
commit 7fe28a9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/app/helpers/items_helper.rb b/app/helpers/items_helper.rb
@@ -6,7 +6,7 @@ def user_name(value)
 
   def item_history_info(version)
     parameters = build_history_parameters(version)
-    t(version.event, parameters.merge(scope: %i[history item event]))
+    t(version.event, **parameters.merge(scope: %i[history item event]))
   end
 
   def build_history_parameters(version)
@@ -17,8 +17,8 @@ def build_history_parameters(version)
       new_total: version.changeset["current_quantity"].last
     }
 
-    parameters[:amount_description] = t(version.edit_method, parameters.merge(scope: %i[history item method]))
-    parameters[:reason] = t(version.edit_reason, parameters.merge(scope: %i[history item reason]))
+    parameters[:amount_description] = t(version.edit_method, **parameters.merge(scope: %i[history item method]))
+    parameters[:reason] = t(version.edit_reason, **parameters.merge(scope: %i[history item reason]))
     parameters
   end
 

diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb
@@ -68,6 +68,6 @@ def cancel_order_confirm(order)
       # rubocop:enable Rails/OutputSafety
     end
 
-    confirm(confirm_options)
+    confirm(**confirm_options)
   end
 end
diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb
@@ -58,7 +58,7 @@
 
               <% if current_user.can_export? %>
                 <li role="separator" class="divider"></li>
-                <li><%= link_to "Export Master Inventory", exports_path %></li>
+                <li><%= link_to "Export Master Inventory", exports_path, data: { turbolinks: false } %></li>
                 <li role="separator" class="divider"></li>
               <% end %>
             </ul>
@@ -111,7 +111,7 @@
           </a>
           <ul class="dropdown-menu">
             <% if current_user.can_backup? %>
-              <li><%= link_to "Download Backup", backup_path %></li>
+              <li><%= link_to "Download Backup", backup_path, data: { turbolinks: false } %></li>
               <li role="separator" class="divider"></li>
             <% end %>
 

diff --git a/app/views/donors/_tabs.html.erb b/app/views/donors/_tabs.html.erb
@@ -13,7 +13,7 @@
     <div class="col-xs-6">
       <div class="pull-right">
         <% if current_user.can_view_reports? && local_assigns[:export] %>
-          <%= link_to "Export", export_donors_path, class: "btn btn-primary" %>
+          <%= link_to "Export", export_donors_path, class: "btn btn-primary", data: { turbolinks: false } %>
         <% end %>
 
         <% if current_user.can_create_donors? %>

diff --git a/app/views/inventory_reconciliations/_incomplete_deltas.html.erb b/app/views/inventory_reconciliations/_incomplete_deltas.html.erb
@@ -1,6 +1,6 @@
 <div class="row bottom15">
   <div class="col-xs-12">
-    <%= button_to "Complete", complete_inventory_reconciliation_path(@reconciliation), method: :post, class: "btn btn-danger", disabled: !@reconciliation.deltas.ready_to_complete?, data: confirm(@reconciliation.deltas.complete_confirm_options) %>
+    <%= button_to "Complete", complete_inventory_reconciliation_path(@reconciliation), method: :post, class: "btn btn-danger", disabled: !@reconciliation.deltas.ready_to_complete?, data: confirm(**@reconciliation.deltas.complete_confirm_options) %>
   </div>
 </div>
 
@@ -49,6 +49,6 @@
 
 <div class="row">
   <div class="col-xs-12">
-    <%= button_to "Complete", complete_inventory_reconciliation_path(@reconciliation), method: :post, class: "btn btn-danger", disabled: !@reconciliation.deltas.ready_to_complete?, data: confirm(@reconciliation.deltas.complete_confirm_options) %>
+    <%= button_to "Complete", complete_inventory_reconciliation_path(@reconciliation), method: :post, class: "btn btn-danger", disabled: !@reconciliation.deltas.ready_to_complete?, data: confirm(**@reconciliation.deltas.complete_confirm_options) %>
   </div>
 </div>
diff --git a/app/views/survey_requests/_tabs.html.erb b/app/views/survey_requests/_tabs.html.erb
@@ -10,7 +10,7 @@
   <% if params[:action] == "report" %>
     <div class="col-xs-6">
       <div class="pull-right">
-        <%= link_to "Export", export_survey_request_path(@survey_request), class: "btn btn-primary" %>
+        <%= link_to "Export", export_survey_request_path(@survey_request), class: "btn btn-primary", data: { turbolinks: false } %>
       </div>
     </div>
   <% end %>

diff --git a/app/views/users/_tabs.html.erb b/app/views/users/_tabs.html.erb
@@ -18,7 +18,7 @@
     <div class="col-xs-6">
       <div class="pull-right">
         <% if current_user.can_view_reports? && local_assigns[:export] %>
-          <%= link_to "Export", export_users_path, class: "btn btn-primary" %>
+          <%= link_to "Export", export_users_path, class: "btn btn-primary", data: { turbolinks: false } %>
         <% end %>
 
         <% if current_user.can_invite_user? %>