diff --git a/app/controllers/admin/budget_investments_controller.rb b/app/controllers/admin/budget_investments_controller.rb index 569cc0c57..b83189ccd 100644 --- a/app/controllers/admin/budget_investments_controller.rb +++ b/app/controllers/admin/budget_investments_controller.rb @@ -39,7 +39,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController if @investment.update(budget_investment_params) redirect_to admin_budget_budget_investment_path(@budget, @investment, - Budget::Investment.filter_params(params)), + Budget::Investment.filter_params(params).to_h), notice: t("flash.actions.update.budget_investment") else load_admins diff --git a/app/controllers/valuation/budget_investments_controller.rb b/app/controllers/valuation/budget_investments_controller.rb index 2ee531f27..5562280c2 100644 --- a/app/controllers/valuation/budget_investments_controller.rb +++ b/app/controllers/valuation/budget_investments_controller.rb @@ -97,8 +97,8 @@ class Valuation::BudgetInvestmentsController < Valuation::BaseController end def params_for_current_valuator - Budget::Investment.filter_params(params).merge(valuator_id: current_user.valuator.id, - budget_id: @budget.id) + Budget::Investment.filter_params(params).to_h.merge({ valuator_id: current_user.valuator.id, + budget_id: @budget.id }) end def valuation_params diff --git a/app/views/admin/budget_investments/_select_investment.html.erb b/app/views/admin/budget_investments/_select_investment.html.erb index e4c7f5355..040d128e1 100644 --- a/app/views/admin/budget_investments/_select_investment.html.erb +++ b/app/views/admin/budget_investments/_select_investment.html.erb @@ -5,7 +5,7 @@ <%= link_to investment.title, admin_budget_budget_investment_path(budget_id: @budget.id, id: investment.id, - params: Budget::Investment.filter_params(params)), + params: Budget::Investment.filter_params(params).to_h), target: "_blank" %> diff --git a/app/views/admin/budget_investments/edit.html.erb b/app/views/admin/budget_investments/edit.html.erb index 6cfcfbe63..a9c81dd39 100644 --- a/app/views/admin/budget_investments/edit.html.erb +++ b/app/views/admin/budget_investments/edit.html.erb @@ -1,11 +1,11 @@ -<%= link_to admin_budget_budget_investment_path(@budget, @investment, Budget::Investment.filter_params(params)), class: "back" do %> +<%= link_to admin_budget_budget_investment_path(@budget, @investment, Budget::Investment.filter_params(params).to_h), class: "back" do %> <%= t("shared.back") %> <% end %> <%= form_for @investment, url: admin_budget_budget_investment_path(@budget, @investment) do |f| %> - <% Budget::Investment.filter_params(params).each do |filter_name, filter_value| %> + <% Budget::Investment.filter_params(params).to_h.each do |filter_name, filter_value| %> <%= hidden_field_tag filter_name, filter_value %> <% end %> diff --git a/app/views/admin/budget_investments/show.html.erb b/app/views/admin/budget_investments/show.html.erb index 191b498ef..d364118ca 100644 --- a/app/views/admin/budget_investments/show.html.erb +++ b/app/views/admin/budget_investments/show.html.erb @@ -1,4 +1,4 @@ -<%= link_to admin_budget_budget_investments_path(Budget::Investment.filter_params(params)), +<%= link_to admin_budget_budget_investments_path(Budget::Investment.filter_params(params).to_h), class: "back", data: {no_turbolink: true} do %> <%= t("shared.back") %> <% end %> @@ -7,7 +7,7 @@ <%= link_to t("admin.budget_investments.show.edit"), edit_admin_budget_budget_investment_path(@budget, @investment, - Budget::Investment.filter_params(params)) unless @budget.finished? %> + Budget::Investment.filter_params(params).to_h) unless @budget.finished? %>
@@ -44,7 +44,7 @@

<%= link_to t("admin.budget_investments.show.edit_classification"), edit_admin_budget_budget_investment_path(@budget, @investment, - {anchor: "classification"}.merge(Budget::Investment.filter_params(params))) unless @budget.finished? %> + {anchor: "classification"}.merge(Budget::Investment.filter_params(params).to_h)) unless @budget.finished? %>


diff --git a/spec/controllers/concerns/has_orders_spec.rb b/spec/controllers/concerns/has_orders_spec.rb index 4a6f66299..a14346802 100644 --- a/spec/controllers/concerns/has_orders_spec.rb +++ b/spec/controllers/concerns/has_orders_spec.rb @@ -14,7 +14,7 @@ describe HasOrders do end def new - render text: "#{@current_order} (#{@valid_orders.join(" ")})" + render plain: "#{@current_order} (#{@valid_orders.join(" ")})" end end