diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-08-21 15:51:15 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-08-21 15:51:15 +0100 |
| commit | 69c700d1ff12bb798569e00f8bf91c539b0ae336 (patch) | |
| tree | f2cc3d5f57772b46738f1a7a6ab20fb8b5ca8739 /app/controllers/admin_request_controller.rb | |
| parent | 721a546dfc9b3c461505f51a0cf036ec1c31ce69 (diff) | |
| parent | 23a2f7f147ae49f35aa573c2dc68e33c43178471 (diff) | |
Merge branch 'issues/1181-destroy-external-request' into rails-3-develop
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 5c45a6e6e..21120e4ad 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -100,7 +100,8 @@ class AdminRequestController < AdminController @info_request.fully_destroy # expire cached files expire_for_request(@info_request) - flash[:notice] = "Request #{url_title} has been completely destroyed. Email of user who made request: " + user.email + email = user.try(:email) ? user.email : 'This request is external so has no associated user' + flash[:notice] = "Request #{ url_title } has been completely destroyed. Email of user who made request: #{ email }" redirect_to admin_request_list_url end |