From 178bbdca880bca96f4742d7e030d3a06a2b803f0 Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Thu, 5 Mar 2009 23:17:38 -0300 Subject: [PATCH] Fixes #2719 --- app/models/user.rb | 2 +- db/migrate/102_change_user_login_limit.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) create mode 100644 db/migrate/102_change_user_login_limit.rb diff --git a/app/models/user.rb b/app/models/user.rb index 9692390..59bc93e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -57,7 +57,7 @@ class User < ActiveRecord::Base validates_uniqueness_of :mail, :if => Proc.new { |user| !user.mail.blank? } # Login must contain lettres, numbers, underscores only validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i - validates_length_of :login, :maximum => 30 + validates_length_of :login, :maximum => 60 validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-\.]*$/i validates_length_of :firstname, :lastname, :maximum => 30 validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true diff --git a/db/migrate/102_change_user_login_limit.rb b/db/migrate/102_change_user_login_limit.rb new file mode 100644 index 0000000..f99cf3a --- /dev/null +++ b/db/migrate/102_change_user_login_limit.rb @@ -0,0 +1,9 @@ +class ChangeUserNameLimit < ActiveRecord::Migration + def self.up + change_column :users, :login, :string, :limit => 60, :default => "", :null => false + end + + def self.down + change_column :users, :login, :string, :limit => 30, :default => "", :null => false + end +end -- 1.5.5.4