diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/post_redirect.rb | 3 | ||||
| -rw-r--r-- | app/models/user.rb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb index 2507cfdd6..3b79e638f 100644 --- a/app/models/post_redirect.rb +++ b/app/models/post_redirect.rb @@ -25,7 +25,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: post_redirect.rb,v 1.20 2008-02-27 14:01:30 francis Exp $ +# $Id: post_redirect.rb,v 1.21 2008-02-28 16:25:30 francis Exp $ require 'openssl' # for random bytes function @@ -68,7 +68,6 @@ class PostRedirect < ActiveRecord::Base self.token = PostRedirect.generate_random_token end # There is a separate token to use in the URL if we send a confirmation email. - # This is because if not self.email_token self.email_token = PostRedirect.generate_random_token end diff --git a/app/models/user.rb b/app/models/user.rb index 277d8958d..bc1028ae1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -20,7 +20,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user.rb,v 1.32 2008-02-28 12:29:43 francis Exp $ +# $Id: user.rb,v 1.33 2008-02-28 16:25:30 francis Exp $ require 'digest/sha1' @@ -34,6 +34,7 @@ class User < ActiveRecord::Base has_many :info_requests has_many :user_info_request_sent_alerts + has_many :post_redirects attr_accessor :password_confirmation validates_confirmation_of :password, :message =>"^Please enter the same password twice" |