meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-11 01:51:32 +00:00
Code Issues Releases Wiki Activity

Fixed an error when member's project is nil (#17486).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13334 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-07-29 17:49:53 +00:00
parent d2b505b2c3
commit 41e7210210
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/member.rb
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

10
test/unit/member_test.rb
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