Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-24 17:56:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

No point in changing the name of the OpenID identity column in users table. Use the existing one.

Browse source
This commit is contained in:
Eric Allen 2008-12-08 18:51:33 -05:00
parent c46e5a9e1d
commit 611a53e668
5 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/models/user.rb
View file

@ -116,11 +116,11 @@ class User < ActiveRecord::Base
validates_confirmation_of :password
validates_length_of :login, :within => 3..80
validates_uniqueness_of :login, :on => :create
validates_presence_of :identity_url, :if => :using_openid?
validates_presence_of :open_id_url, :if => :using_openid?
before_create :crypt_password, :generate_token
before_update :crypt_password
before_save :normalize_identity_url
before_save :normalize_open_id_url
#for will_paginate plugin
cattr_accessor :per_page
@ -145,9 +145,9 @@ class User < ActiveRecord::Base
return nil
end
def self.find_by_identity_url(raw_identity_url)
normalized_identity_url = OpenIdAuthentication.normalize_url(raw_identity_url)
find(:first, :conditions => ['identity_url = ?', normalized_identity_url])
def self.find_by_open_id_url(raw_identity_url)
normalized_open_id_url = OpenIdAuthentication.normalize_url(raw_identity_url)
find(:first, :conditions => ['open_id_url = ?', normalized_open_id_url])
end
def self.no_users_yet?
@ -235,8 +235,8 @@ protected
crypted_password == sha1(pass)
end
def normalize_identity_url
return if identity_url.nil?
self.identity_url = OpenIdAuthentication.normalize_url(identity_url)
def normalize_open_id_url
return if open_id_url.nil?
self.open_id_url = OpenIdAuthentication.normalize_url(open_id_url)
end
end