Merged r13334 (#17486).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13389 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-09-13 10:08:42 +00:00
parent 443a5896af
commit 5f184f9fd1
2 changed files with 12 additions and 2 deletions

View File

@@ -94,9 +94,9 @@ class Member < ActiveRecord::Base
end
def set_issue_category_nil
if user
if user_id && project_id
# remove category based auto assignments for this member
IssueCategory.where(["project_id = ? AND assigned_to_id = ?", project.id, user.id]).
IssueCategory.where(["project_id = ? AND assigned_to_id = ?", project_id, user_id]).
update_all("assigned_to_id = NULL")
end
end

View File

@@ -94,6 +94,16 @@ class MemberTest < ActiveSupport::TestCase
assert !member.save
end
def test_set_issue_category_nil_should_handle_nil_values
m = Member.new
assert_nil m.user
assert_nil m.project
assert_nothing_raised do
m.set_issue_category_nil
end
end
def test_destroy
category1 = IssueCategory.find(1)
assert_equal @jsmith.user.id, category1.assigned_to_id