consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes some deprecation warnings

Browse Source
This commit is contained in:
alejandro
2017-05-01 12:49:46 +02:00
committed by Julian Herrero
parent 1077a632cb
commit bafab3b769
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/budget_investments_controller.rb
View File

@@ -39,7 +39,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
if @investment.update(budget_investment_params) if @investment.update(budget_investment_params)
redirect_to admin_budget_budget_investment_path(@budget, redirect_to admin_budget_budget_investment_path(@budget,
@investment, @investment,
Budget::Investment.filter_params(params)), Budget::Investment.filter_params(params).to_h),
notice: t("flash.actions.update.budget_investment") notice: t("flash.actions.update.budget_investment")
else else
load_admins load_admins

4
app/controllers/valuation/budget_investments_controller.rb
View File

@@ -97,8 +97,8 @@ class Valuation::BudgetInvestmentsController < Valuation::BaseController
end end
def params_for_current_valuator def params_for_current_valuator
Budget::Investment.filter_params(params).merge(valuator_id: current_user.valuator.id, Budget::Investment.filter_params(params).to_h.merge({ valuator_id: current_user.valuator.id,
budget_id: @budget.id) budget_id: @budget.id })
end end
def valuation_params def valuation_params

2
app/views/admin/budget_investments/_select_investment.html.erb
View File

@@ -5,7 +5,7 @@
<%= link_to investment.title, <%= link_to investment.title,
admin_budget_budget_investment_path(budget_id: @budget.id, admin_budget_budget_investment_path(budget_id: @budget.id,
id: investment.id, id: investment.id,
params: Budget::Investment.filter_params(params)), params: Budget::Investment.filter_params(params).to_h),
target: "_blank" %> target: "_blank" %>
</td> </td>
<td class="text-center"> <td class="text-center">

4
app/views/admin/budget_investments/edit.html.erb
View File

@@ -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 %>
<span class="icon-angle-left"></span> <%= t("shared.back") %> <span class="icon-angle-left"></span> <%= t("shared.back") %>
<% end %> <% end %>
<%= form_for @investment, <%= form_for @investment,
url: admin_budget_budget_investment_path(@budget, @investment) do |f| %> 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 %> <%= hidden_field_tag filter_name, filter_value %>
<% end %> <% end %>

6
app/views/admin/budget_investments/show.html.erb
View File

@@ -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 %> class: "back", data: {no_turbolink: true} do %>
<span class="icon-angle-left"></span><%= t("shared.back") %> <span class="icon-angle-left"></span><%= t("shared.back") %>
<% end %> <% end %>
@@ -7,7 +7,7 @@
<%= link_to t("admin.budget_investments.show.edit"), <%= link_to t("admin.budget_investments.show.edit"),
edit_admin_budget_budget_investment_path(@budget, @investment, 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? %>
<hr> <hr>
@@ -44,7 +44,7 @@
<p> <p>
<%= link_to t("admin.budget_investments.show.edit_classification"), <%= link_to t("admin.budget_investments.show.edit_classification"),
edit_admin_budget_budget_investment_path(@budget, @investment, 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? %>
</p> </p>
<hr> <hr>

2
spec/controllers/concerns/has_orders_spec.rb
View File

@@ -14,7 +14,7 @@ describe HasOrders do
end end
def new def new
render text: "#{@current_order} (#{@valid_orders.join(" ")})" render plain: "#{@current_order} (#{@valid_orders.join(" ")})"
end end
end end