From fd8fb490150314eafc81d2c3af04d9a4a686860b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 6 May 2016 12:18:38 +0200 Subject: [PATCH] hides retire link if no author/admin --- app/controllers/users_controller.rb | 1 + app/views/users/_proposals.html.erb | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1324fbdfa..af4005e06 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,6 +3,7 @@ class UsersController < ApplicationController load_and_authorize_resource helper_method :authorized_for_filter? + helper_method :author_or_admin? def show load_filtered_activity if valid_access? diff --git a/app/views/users/_proposals.html.erb b/app/views/users/_proposals.html.erb index 9ec1368bd..e0b54dcc4 100644 --- a/app/views/users/_proposals.html.erb +++ b/app/views/users/_proposals.html.erb @@ -6,15 +6,18 @@
<%= proposal.summary %> - - <% if proposal.retired? %> - <%= t('users.show.retired') %> - <% else %> - <%= link_to t('users.show.retire'), - retire_form_proposal_path(proposal), - class: 'delete' %> - <% end %> - + + <% if author_or_admin? %> + + <% if proposal.retired? %> + <%= t('users.show.retired') %> + <% else %> + <%= link_to t('users.show.retire'), + retire_form_proposal_path(proposal), + class: 'delete' %> + <% end %> + + <% end %> <% end %>