Merged r14049 (#19197).

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

2 files changed, 10 insertions, 2 deletions

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 36abf0726..375dfb29d 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -784,12 +784,12 @@ class Issue < ActiveRecord::Base
     end
   end
 
-  # Returns the previous assignee if changed
+  # Returns the previous assignee (user or group) if changed
   def assigned_to_was
     # assigned_to_id_was is reset before after_save callbacks
     user_id = @previous_assigned_to_id || assigned_to_id_was
     if user_id && user_id != assigned_to_id
-      @assigned_to_was ||= User.find_by_id(user_id)
+      @assigned_to_was ||= Principal.find_by_id(user_id)
     end
   end
 
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 9998be283..0008a3779 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -2416,4 +2416,12 @@ class IssueTest < ActiveSupport::TestCase
     assert issue.save!
     assert_equal IssueStatus.find(2), issue.status_was
   end
+
+  def test_assigned_to_was_with_a_group
+    group = Group.find(10)
+
+    issue = Issue.generate!(:assigned_to => group)
+    issue.reload.assigned_to = nil
+    assert_equal group, issue.assigned_to_was
+  end
 end