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

hides retire link if no author/admin

Browse Source
This commit is contained in:
Juanjo Bazán
2016-05-06 12:18:38 +02:00
parent 5f08d65152
commit fd8fb49015
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/users_controller.rb
View File

@@ -3,6 +3,7 @@ class UsersController < ApplicationController
load_and_authorize_resource load_and_authorize_resource
helper_method :authorized_for_filter? helper_method :authorized_for_filter?
helper_method :author_or_admin?
def show def show
load_filtered_activity if valid_access? load_filtered_activity if valid_access?

3
app/views/users/_proposals.html.erb
View File

@@ -6,6 +6,8 @@
<br> <br>
<%= proposal.summary %> <%= proposal.summary %>
</td> </td>
<% if author_or_admin? %>
<td class="text-center"> <td class="text-center">
<% if proposal.retired? %> <% if proposal.retired? %>
<span class="label alert"><%= t('users.show.retired') %></span> <span class="label alert"><%= t('users.show.retired') %></span>
@@ -15,6 +17,7 @@
class: 'delete' %> class: 'delete' %>
<% end %> <% end %>
</td> </td>
<% end %>
</tr> </tr>
<% end %> <% end %>
</table> </table>