jro_apps/redmine Commit - r14938:97a647c1e5d4

Validate status of users and groups....

Jean-Philippe Lang -

r14938:97a647c1e5d4

parent child

Context file:

r14938:97a647c1e5d4

app/models/group.rb +2 0

               validates_length_of :lastname, :maximum => 255
               attr_protected :id
+              self.valid_statuses = [STATUS_ACTIVE]
               before_destroy :remove_references_before_destroy
               scope :sorted, lambda { order(:type => :asc, :lastname => :asc) }

app/models/principal.rb +12 0

               STATUS_REGISTERED = 2
               STATUS_LOCKED     = 3
+              class_attribute :valid_statuses
               has_many :members, :foreign_key => 'user_id', :dependent => :destroy
               has_many :memberships,
                        lambda {preload(:project, :roles).
               has_many :projects, :through => :memberships
               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
+              validate :validate_status
               # Groups and active users
               scope :active, lambda { where(:status => STATUS_ACTIVE) }
                 self.lastname ||= ''
                 true
               end
+              def validate_status
+                if status_changed? && self.class.valid_statuses.present?
+                  unless self.class.valid_statuses.include?(status)
+                    errors.add :status, :invalid
+                  end
+                end
+              end
             end
             require_dependency "user"

app/models/user.rb +4 0

                 end
               end
+              self.valid_statuses = [STATUS_ACTIVE, STATUS_REGISTERED, STATUS_LOCKED]
               before_validation :instantiate_email_address
               before_create :set_mail_notification
               before_save   :generate_password_if_needed, :update_hashed_password
             class AnonymousUser < User
               validate :validate_anonymous_uniqueness, :on => :create
+              self.valid_statuses = [STATUS_ANONYMOUS]
               def validate_anonymous_uniqueness
                 # There should be only one AnonymousUser in the database
                 errors.add :base, 'An anonymous user already exists.' if AnonymousUser.exists?

test/unit/user_test.rb +8 0

                 assert_kind_of User, @jsmith
               end
+              def test_should_validate_status
+                user = User.new
+                user.status = 0
+                assert !user.save
+                assert_include I18n.translate('activerecord.errors.messages.invalid'), user.errors[:status]
+              end
               def test_mail_should_be_stripped
                 u = User.new
                 u.mail = " foo@bar.com  "

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages