diff options
| author | Robert | 2017-04-19 10:21:26 +0200 |
|---|---|---|
| committer | Robert | 2017-04-19 10:21:26 +0200 |
| commit | 8beeb423f5a4aa389541bdc06713b4f625b65387 (patch) | |
| tree | bb8cc16b352f11e0525200b4808ca7b3f2f1c25f | |
| parent | 1e2f4add9044962c3a1405be0fa2e7ed510dcf90 (diff) | |
| download | chouette-core-8beeb423f5a4aa389541bdc06713b4f625b65387.tar.bz2 | |
removed validation for uniqueness of permissions in user
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d27007d43..8e73aa1d5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -21,7 +21,6 @@ class User < ActiveRecord::Base validates :organisation, :presence => true validates :email, :presence => true, :uniqueness => true validates :name, :presence => true - validate :permissions_unique_and_nonempty before_validation(:on => :create) do self.password ||= Devise.friendly_token.first(6) @@ -86,10 +85,4 @@ class User < ActiveRecord::Base end end - def permissions_unique_and_nonempty - if permissions && permissions.any? - errors.add(:permissions, I18n.t('activerecord.errors.models.calendar.attributes.permissions.must_be_unique')) if permissions.uniq.length != permissions.length - errors.add(:permissions, I18n.t('activerecord.errors.models.calendar.attributes.permissions.must_be_nonempty')) if permissions.include? '' - end - end end |
