Merge branch 'develop' into xapian-dcabo

Conflicts:
	spec/models/xapian_spec.rb

1 files changed, 12 insertions, 0 deletions

diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb
index 404c4c3fe..5d90e74fe 100644
--- a/app/controllers/admin_user_controller.rb
+++ b/app/controllers/admin_user_controller.rb
@@ -28,6 +28,10 @@ class AdminUserController < AdminController
         # 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])
@@ -57,6 +61,14 @@ class AdminUserController < AdminController
         flash[:notice] = 'Track destroyed'
         redirect_to user_admin_url(track_thing.tracking_user)
     end
+    
+    def clear_bounce
+        user = User.find(params[:id])
+        user.email_bounced_at = nil
+        user.email_bounce_message = ""
+        user.save!
+        redirect_to user_admin_url(user)
+    end
 
     def login_as
         @admin_user = User.find(params[:id]) # check user does exist