diff options
| author | Francis Irving <francis@mysociety.org> | 2010-07-13 23:54:46 +0100 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2010-07-13 23:54:46 +0100 |
| commit | 59395b3bdf19aed7bf5f77656afa6c31dad7e138 (patch) | |
| tree | b6e4c9f9e5b4a9f792a550ce3af727ae32b1cba1 /app/controllers/admin_request_controller.rb | |
| parent | 452ac41f05f655a9fd23c8df4796f26632c23050 (diff) | |
| parent | da2c0aaf5f0d07baa3a355033a92d5dd295f2f13 (diff) | |
Merge branch 'master' into francis-profile-photo
Conflicts:
app/views/user/show.rhtml
commonlib
spec/controllers/user_controller_spec.rb
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index ff2772b0e..f077691ff 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -215,10 +215,10 @@ class AdminRequestController < AdminController # Bejeeps, look, sometimes a URL is something that belongs in a controller, jesus. # XXX hammer this square peg into the round MVC hole - should be calling main_url(upload_response_url()) post_redirect = PostRedirect.new( - :uri => upload_response_url(:url_title => info_request.url_title), + :uri => main_url(upload_response_url(:url_title => info_request.url_title, :only_path => true)), :user_id => user.id) post_redirect.save! - url = confirm_url(:email_token => post_redirect.email_token) + url = main_url(confirm_url(:email_token => post_redirect.email_token, :only_path => true)) flash[:notice] = 'Send "' + name + '" <<a href="mailto:' + email + '">' + email + '</a>> this URL: <a href="' + url + '">' + url + "</a> - it will log them in and let them upload a response to this request." redirect_to request_admin_url(info_request) |