Commit 96b735ad9f74e810509e8b3819e9090891adbcc3
- Date: Mon Jul 07 19:51:27 +0000 2008
- Committer: Johan Sørensen (johan@johansorensen.com)
- Author: Johan Sørensen (johan@johansorensen.com)
- Commit SHA1: 96b735ad9f74e810509e8b3819e9090891adbcc3
- Tree SHA1: ace7f4b8d6889c134092565045c4abf040b1fa27
reword openid nickname collision error message just a tiny bit to avoid some confusion
Commit diff
| | |
| 43 | 43 | failed_login result.message, 'openid' |
| 44 | 44 | end |
| 45 | 45 | end |
| 46 | | rescue ActiveRecord::RecordInvalid => invalid |
| 47 | | flash[:error] = "This login (<strong>#{@user.login}</strong>) already exists, please <a href="+@user.identity_url+">choose a different persona or modify the current one</a>" |
| 48 | | |
| 46 | rescue ActiveRecord::RecordInvalid => invalid |
| 47 | flash[:error] = %Q{This login (<strong>#{@user.login}</strong>) already exists, |
| 48 | please <a href="#{@user.identity_url}"> choose a different persona/nickname |
| 49 | or modify the current one</a>} |
| 49 | 50 | redirect_to login_path(:method => 'openid') |
| 50 | 51 | end |
| 51 | 52 | |
| toggle raw diff |
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -43,9 +43,10 @@ class SessionsController < ApplicationController
failed_login result.message, 'openid'
end
end
- rescue ActiveRecord::RecordInvalid => invalid
- flash[:error] = "This login (<strong>#{@user.login}</strong>) already exists, please <a href="+@user.identity_url+">choose a different persona or modify the current one</a>"
-
+ rescue ActiveRecord::RecordInvalid => invalid
+ flash[:error] = %Q{This login (<strong>#{@user.login}</strong>) already exists,
+ please <a href="#{@user.identity_url}"> choose a different persona/nickname
+ or modify the current one</a>}
redirect_to login_path(:method => 'openid')
end
|
