diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin_censor_rule_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/admin_user_controller.rb | 32 |
2 files changed, 17 insertions, 21 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index dd0af002d..01c0bf4b2 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -54,7 +54,7 @@ class AdminCensorRuleController < AdminController if !@censor_rule.info_request.nil? redirect_to admin_request_url(@censor_rule.info_request) elsif !@censor_rule.user.nil? - redirect_to admin_user_show_url(@censor_rule.user) + redirect_to admin_user_url(@censor_rule.user) else raise "internal error" end @@ -85,7 +85,7 @@ class AdminCensorRuleController < AdminController if !@censor_rule.info_request.nil? redirect_to admin_request_url(@censor_rule.info_request) elsif !@censor_rule.user.nil? - redirect_to admin_user_show_url(@censor_rule.user) + redirect_to admin_user_url(@censor_rule.user) else raise "internal error" end @@ -114,7 +114,7 @@ class AdminCensorRuleController < AdminController if !info_request.nil? redirect_to admin_request_url(info_request) elsif !user.nil? - redirect_to admin_user_show_url(user) + redirect_to admin_user_url(user) else raise "internal error" end diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index a6438e151..3379b9629 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -5,12 +5,8 @@ # Email: hello@mysociety.org; WWW: http://www.mysociety.org/ class AdminUserController < AdminController - def index - list - render :action => 'list' - end - def list + def index @query = params[:query] if @query users = User.where(["lower(name) like lower('%'||?||'%') or @@ -21,20 +17,11 @@ class AdminUserController < AdminController @admin_users = users.paginate :order => "name", :page => params[:page], :per_page => 100 end - def list_banned - @banned_users = User.paginate :order => "name", :page => params[:page], :per_page => 100, - :conditions => ["ban_text <> ''"] - end - def show # Don't use @user as that is any logged in user @admin_user = User.find(params[:id]) end - def show_bounce_message - @admin_user = User.find(params[:id]) - end - def edit @admin_user = User.find(params[:id]) end @@ -53,17 +40,26 @@ class AdminUserController < AdminController if @admin_user.valid? @admin_user.save! flash[:notice] = 'User successfully updated.' - redirect_to admin_user_show_url(@admin_user) + redirect_to admin_user_url(@admin_user) else render :action => 'edit' end end + def list_banned + @banned_users = User.paginate :order => "name", :page => params[:page], :per_page => 100, + :conditions => ["ban_text <> ''"] + end + + def show_bounce_message + @admin_user = User.find(params[:id]) + end + def destroy_track track_thing = TrackThing.find(params[:track_id].to_i) track_thing.destroy flash[:notice] = 'Track destroyed' - redirect_to admin_user_show_url(track_thing.tracking_user) + redirect_to admin_user_url(track_thing.tracking_user) end def clear_bounce @@ -71,7 +67,7 @@ class AdminUserController < AdminController user.email_bounced_at = nil user.email_bounce_message = "" user.save! - redirect_to admin_user_show_url(user) + redirect_to admin_user_url(user) end def login_as @@ -96,7 +92,7 @@ class AdminUserController < AdminController end flash[:notice] = "Profile photo cleared" - redirect_to admin_user_show_url(@admin_user) + redirect_to admin_user_url(@admin_user) end def modify_comment_visibility |