fixes #912
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
module Admin
|
module Admin
|
||||||
class UsersController < ApplicationController
|
class UsersController < ApplicationController
|
||||||
before_filter :admin_only
|
before_filter :moderator_only
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
@user = User.find(params[:id])
|
@user = User.find(params[:id])
|
||||||
|
|||||||
@@ -2,9 +2,11 @@
|
|||||||
<menu>
|
<menu>
|
||||||
<li><%= link_to "Listing", users_path %></li>
|
<li><%= link_to "Listing", users_path %></li>
|
||||||
<li><%= link_to "Search", search_users_path %></li>
|
<li><%= link_to "Search", search_users_path %></li>
|
||||||
|
|
||||||
<% if CurrentUser.is_anonymous? %>
|
<% if CurrentUser.is_anonymous? %>
|
||||||
<li><%= link_to "Sign up", new_user_path %></li>
|
<li><%= link_to "Sign up", new_user_path %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @user && !@user.new_record? && !CurrentUser.is_anonymous? %>
|
<% if @user && !@user.new_record? && !CurrentUser.is_anonymous? %>
|
||||||
<li>|</li>
|
<li>|</li>
|
||||||
<% if @user.id == CurrentUser.id %>
|
<% if @user.id == CurrentUser.id %>
|
||||||
@@ -17,12 +19,15 @@
|
|||||||
<% else %>
|
<% else %>
|
||||||
<li><%= link_to "Send message", new_dmail_path(:dmail => {:to_id => @user.id}) %></li>
|
<li><%= link_to "Send message", new_dmail_path(:dmail => {:to_id => @user.id}) %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if !CurrentUser.is_privileged? %>
|
<% if !CurrentUser.is_privileged? %>
|
||||||
<li><%= link_to "Upgrade", upgrade_information_users_path %></li>
|
<li><%= link_to "Upgrade", upgrade_information_users_path %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if CurrentUser.is_admin? %>
|
|
||||||
|
<% if CurrentUser.is_moderator? %>
|
||||||
<li><%= link_to "Promote", edit_admin_user_path(@user) %></li>
|
<li><%= link_to "Promote", edit_admin_user_path(@user) %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<li>|</li>
|
<li>|</li>
|
||||||
<li><%= link_to "Sign out", sign_out_session_path %></li>
|
<li><%= link_to "Sign out", sign_out_session_path %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user