diff --git a/app/helpers/budget_headings_helper.rb b/app/helpers/budget_headings_helper.rb index 3fa1eac89..22eabfe11 100644 --- a/app/helpers/budget_headings_helper.rb +++ b/app/helpers/budget_headings_helper.rb @@ -6,4 +6,10 @@ module BudgetHeadingsHelper end end + def heading_link(assigned_heading = nil, budget = nil) + return nil unless assigned_heading && budget + heading_path = budget_investments_path(budget, heading_id: assigned_heading.try(:id)) + link_to(assigned_heading.name, heading_path) + end + end diff --git a/app/views/budgets/investments/_ballot.html.erb b/app/views/budgets/investments/_ballot.html.erb index f65ec6c74..c12103a0a 100644 --- a/app/views/budgets/investments/_ballot.html.erb +++ b/app/views/budgets/investments/_ballot.html.erb @@ -53,19 +53,13 @@ <% change_ballot = link_to(t("budgets.ballots.reasons_for_not_balloting.change_ballot"), budget_ballot_path(@budget))%> - <% if @assigned_heading.present? %> - <% heading_link = link_to(@assigned_heading.name, - budget_investments_path(@budget, - heading_id: @assigned_heading.try(:id))) %> - <% end %> -

<%= t("budgets.ballots.reasons_for_not_balloting.#{reason}", verify_account: verify_account, signin: signin, signup: signup, my_heading: my_heading, change_ballot: change_ballot, - heading_link: heading_link).html_safe %> + heading_link: heading_link(@assigned_heading, @budget)).html_safe %>

diff --git a/app/views/budgets/investments/_header.html.erb b/app/views/budgets/investments/_header.html.erb index d9f21523a..90d2edfd4 100644 --- a/app/views/budgets/investments/_header.html.erb +++ b/app/views/budgets/investments/_header.html.erb @@ -37,10 +37,7 @@
<%= t("budgets.investments.header.different_heading_assigned_html", - heading_link: link_to( - @assigned_heading.name, - budget_investments_path(@budget, heading_id: @assigned_heading.try(:id))) - ) %> + heading_link: heading_link(@assigned_heading, @budget)) %>
<%= t("budgets.investments.header.change_ballot", diff --git a/app/views/budgets/investments/_sidebar.html.erb b/app/views/budgets/investments/_sidebar.html.erb index 4ae9104d5..c020c8bbe 100644 --- a/app/views/budgets/investments/_sidebar.html.erb +++ b/app/views/budgets/investments/_sidebar.html.erb @@ -43,9 +43,7 @@ <% elsif @assigned_heading.present? %>

<%= t("budgets.investments.index.sidebar.different_heading_assigned_html", - heading_link: link_to( - @assigned_heading.name, - budget_investments_path(@budget, heading_id: @assigned_heading.try(:id))) + heading_link: heading_link(@assigned_heading, @budget) ) %>