Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 11 insertions, 26 deletions

diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb
index a6438e151..7ef461594 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,19 @@ 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 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)
+    def 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 clear_bounce
@@ -71,7 +60,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
@@ -87,16 +76,12 @@ class AdminUserController < AdminController
     def clear_profile_photo
         @admin_user = User.find(params[:id])
 
-        if !request.post?
-            raise "Can only clear profile photo from POST request"
-        end
-
         if @admin_user.profile_photo
             @admin_user.profile_photo.destroy
         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