penguincoder
/
binaryattraction
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better check for facebook id

master
Coleman 2008-12-10 00:25:30 -06:00
parent 6504bddf97
commit 71ce811c7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.rb
View File

@ -9,7 +9,7 @@ class User < ActiveRecord::Base
validates_uniqueness_of :user_name, :if => lambda { |x| x.facebook_id.nil? }
validates_format_of :user_name, :with => /[\w_-]+/, :if => lambda { |x| x.facebook_id.nil? }
validates_presence_of :facebook_id, :if => lambda { |x| x.user_name.to_s.empty? }
validate :user_name_is_alphanumeric
validate :user_name_is_alphanumeric, :if => lambda { |x| x.facebook_id.nil? }
has_many :photos, :dependent => :destroy
has_many :votes, :dependent => :destroy, :order => 'votes.photo_id ASC'
@ -41,7 +41,7 @@ class User < ActiveRecord::Base
protected
def user_name_is_alphanumeric
if self.facebook_id.to_i == 0 and self.user_name.to_s =~ /[^A-Za-z0-9]/
if self.user_name.to_s =~ /[^A-Za-z0-9]/
self.errors.add(:user_name, 'has illegal characters')
end
end