Merge branch 'sismo' into gtfs_v2

2 files changed, 6 insertions, 7 deletions

diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 17cf9a8f2..f4b2e35f8 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -3,6 +3,5 @@ class Organisation < ActiveRecord::Base
   has_many :users, :dependent => :destroy
   has_many :referentials, :dependent => :destroy
 
-  validates_presence_of :name
-  validates_uniqueness_of :name
+  validates :name, :presence => true, :uniqueness => true
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 1889a3bf0..6c14b93fb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,11 +11,11 @@ class User < ActiveRecord::Base
   belongs_to :organisation
 
   accepts_nested_attributes_for :organisation
-  
-  validates_presence_of :email
-  validates_presence_of :name
-  validates_presence_of :password
-  validates_presence_of :password_confirmation
+
+  validates :organisation, :presence => true
+  validates :email, :presence => true, :uniqueness => true
+  validates :name, :presence => true
+  validates :password, :presence => true, :confirmation => true
 
   before_validation(:on => :create) do
     self.password ||= Devise.friendly_token.first(6)