Refs #2398 : Permissions validations fix

1 files changed, 2 insertions, 5 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index fe5d9910d..93b1f8f21 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -77,11 +77,8 @@ class User < ActiveRecord::Base
 
   def permissions_unique_and_nonempty
     if permissions && permissions.any?
-      if permissions.uniq.length != permissions.length
-        errors.add(:permissions, I18n.t('activerecord.errors.models.calendar.attributes.permissions.must_be_unique'))
-      elsif permissions.include? ''
-        errors.add(:permissions, I18n.t('activerecord.errors.models.calendar.attributes.permissions.must_be_nonempty'))
-      end
+      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