From 63e2e52dd37ef9ba9bf5a80f0069929a610cca69 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 29 Nov 2011 21:14:24 +0000 Subject: [PATCH] Merged r7782 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7999 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/project.rb | 1 + test/unit/project_test.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/project.rb b/app/models/project.rb index c3b553083..1072609fa 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -809,6 +809,7 @@ class Project < ActiveRecord::Base new_query.attributes = query.attributes.dup.except("id", "project_id", "sort_criteria") new_query.sort_criteria = query.sort_criteria if query.sort_criteria new_query.project = self + new_query.user_id = query.user_id self.queries << new_query end end diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index 1fe6f1506..f03923f8e 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -888,6 +888,7 @@ class ProjectTest < ActiveSupport::TestCase assert query assert_equal @project, query.project end + assert_equal @source_project.queries.map(&:user_id).sort, @project.queries.map(&:user_id).sort end should "copy versions" do