diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-09-27 22:27:37 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-09-27 22:27:37 +0000 |
| commit | f1fdbf8d80d9867d707b48e0118089c201a3ced7 (patch) | |
| tree | c6a8b53869705b4bd00c04eaa9c0dd270565f38e /app | |
| parent | f58ed6c206743c5217b829c5169bb2b302b8b127 (diff) | |
| download | redmine-f1fdbf8d80d9867d707b48e0118089c201a3ced7.tar.gz redmine-f1fdbf8d80d9867d707b48e0118089c201a3ced7.zip | |
Do not link copied issues when copying a project (#6899).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10495 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/issue.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 0d226455d..b44154340 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1017,7 +1017,7 @@ class Issue < ActiveRecord::Base def after_create_from_copy return unless copy? && !@after_create_from_copy_handled - if @copied_from.project_id == project_id || Setting.cross_project_issue_relations? + if (@copied_from.project_id == project_id || Setting.cross_project_issue_relations?) && @copy_options[:link] != false relation = IssueRelation.new(:issue_from => @copied_from, :issue_to => self, :relation_type => IssueRelation::TYPE_COPIED_TO) unless relation.save logger.error "Could not create relation while copying ##{@copied_from.id} to ##{id} due to validation errors: #{relation.errors.full_messages.join(', ')}" if logger diff --git a/app/models/project.rb b/app/models/project.rb index 9a65bdd2e..295d3cb05 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -778,7 +778,7 @@ class Project < ActiveRecord::Base # get copied before their children project.issues.find(:all, :order => 'root_id, lft').each do |issue| new_issue = Issue.new - new_issue.copy_from(issue, :subtasks => false) + new_issue.copy_from(issue, :subtasks => false, :link => false) new_issue.project = self # Reassign fixed_versions by name, since names are unique per project if issue.fixed_version && issue.fixed_version.project == project |