Adding a lower and upper length on various web site varchar fields. Fixes one test.

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 9b5bfd59528538f1826e6fc993a26eafb4c7301e..525d018ac77ba7a0cae5df86c0bc80dc109c711b 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,8 +15,9 @@ class User < ActiveRecord::Base
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
-  validates_length_of :pass_crypt, :minimum => 8
-  validates_length_of :display_name, :minimum => 3, :allow_nil => true
+  validates_length_of :pass_crypt, :within => 8..255
+  validates_length_of :display_name, :within => 3..255, :allow_nil => true
+  validates_length_of :email, :within => 6..255
   validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
   validates_numericality_of :home_lat, :allow_nil => true