From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 13 Sep 2014 10:08:42 +0000 (+0000)
Subject: Merged r13334 (#17486).
X-Git-Tag: 2.5.3~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5f184f9fd1da198d0dcda5ee38fbb62dd4ab7237;p=redmine.git

Merged r13334 (#17486).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13389 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/member.rb b/app/models/member.rb
index 6ec22d422..85562dbd7 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -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
diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb
index 6ba9717c4..124aa3719 100644
--- a/test/unit/member_test.rb
+++ b/test/unit/member_test.rb
@@ -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