diff --git a/app/models/user/role.rb b/app/models/user/role.rb index a9574a6ef..e12bf0191 100644 --- a/app/models/user/role.rb +++ b/app/models/user/role.rb @@ -18,7 +18,7 @@ module User::Role admin? || other == self end - def can_administer? + def can_administer?(other) admin? && other != self end diff --git a/app/views/account/settings/show.html.erb b/app/views/account/settings/show.html.erb index 9df7b9889..57f3913bf 100644 --- a/app/views/account/settings/show.html.erb +++ b/app/views/account/settings/show.html.erb @@ -3,7 +3,7 @@ <% content_for :header do %>

<%= @page_title %> - <% unless Current.user.can_administer?%> + <% unless Current.user.admin? %>
Only admins can change these settings
<% end %>