From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 21:37:40 +0000 (+0000)
Subject: Trac importer: prevent validation failure due to the default value when saving the... 
X-Git-Tag: 0.7.0-RC1~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7fb72e671b867eefd4ce57ba6b4e69564cbce7a9;p=redmine.git

Trac importer: prevent validation failure due to the default value when saving the Resolution custom field if it already exists (#869).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1286 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 2308e787b..0f116328f 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -324,8 +324,9 @@ namespace :redmine do
                                  :is_filter => true) if r.nil?
         r.trackers = Tracker.find(:all)
         r.projects << @target_project
-        r.possible_values = %w(fixed invalid wontfix duplicate worksforme)
-        custom_field_map['resolution'] = r if r.save
+        r.possible_values = (r.possible_values + %w(fixed invalid wontfix duplicate worksforme)).flatten.compact.uniq
+        r.save!
+        custom_field_map['resolution'] = r
             
         # Tickets
         print "Migrating tickets"