diff --git a/app/controllers/management/spending_proposals_controller.rb b/app/controllers/management/spending_proposals_controller.rb index 3a17d86b1..e6170722a 100644 --- a/app/controllers/management/spending_proposals_controller.rb +++ b/app/controllers/management/spending_proposals_controller.rb @@ -19,6 +19,7 @@ class Management::SpendingProposalsController < Management::BaseController def show @spending_proposal = SpendingProposal.find(params[:id]) + set_spending_proposal_votes(@spending_proposal) end private @@ -37,4 +38,9 @@ class Management::SpendingProposalsController < Management::BaseController managed_user end + # This should not be necessary. Maybe we could create a specific show view for managers. + def set_spending_proposal_votes(spending_proposals) + @spending_proposal_votes = current_user ? current_user.spending_proposal_votes(spending_proposals) : {} + end + end diff --git a/app/views/_votes.html.erb/index.html.erb b/app/views/_votes.html.erb/index.html.erb deleted file mode 100644 index 00a1b6442..000000000 --- a/app/views/_votes.html.erb/index.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -<% provide :title do %><%= t('spending_proposals.index.title') %><% end %> -
-
-
-

<%= t('spending_proposals.index.title') %>

- -

<%= t('spending_proposals.index.text_html') %>

- - <% if can? :create, SpendingProposal %> - <%= link_to t('spending_proposals.index.create_link'), new_spending_proposal_path, class: 'button' %> - <% else %> -

<%= t('spending_proposals.index.verified_only', verify_account: link_to(t('spending_proposals.index.verify_account'), verification_path)).html_safe %>

- <% end %> -
-
-
\ No newline at end of file diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb index 1aaa3d805..38616f28a 100644 --- a/app/views/spending_proposals/show.html.erb +++ b/app/views/spending_proposals/show.html.erb @@ -26,7 +26,7 @@
- <%= render 'votes', + <%= render 'spending_proposals/votes', { spending_proposal: @spending_proposal, vote_url: vote_spending_proposal_path(@spending_proposal, value: 'yes') } %>