diff app/models/member.rb @ 1338:25603efa57b5

Merge from live branch

--- a/app/models/member.rb	Wed Jan 23 13:11:25 2013 +0000
+++ b/app/models/member.rb	Thu Jun 20 13:14:14 2013 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -24,9 +24,17 @@
 
   validates_presence_of :principal, :project
   validates_uniqueness_of :user_id, :scope => :project_id
+  validate :validate_role
 
+  before_destroy :set_issue_category_nil
   after_destroy :unwatch_from_permission_change
 
+  def role
+  end
+
+  def role=
+  end
+
   def name
     self.user.name
   end
@@ -75,7 +83,7 @@
     end
   end
 
-  def before_destroy
+  def set_issue_category_nil
     if user
       # remove category based auto assignments for this member
       IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
@@ -91,7 +99,7 @@
 
   protected
 
-  def validate
+  def validate_role
     errors.add_on_empty :role if member_roles.empty? && roles.empty?
   end