Support external ID when importing issues (#28213).

Patch by Gregor Schmidt and Marius BALTEANU.

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

1 files changed, 21 insertions, 9 deletions

diff --git a/app/models/issue_import.rb b/app/models/issue_import.rb
index 5f99007fe..700d659ba 100644
--- a/app/models/issue_import.rb
+++ b/app/models/issue_import.rb
@@ -150,18 +150,30 @@ class IssueImport < Import
       end
     end
     if parent_issue_id = row_value(row, 'parent_issue_id')
-      if parent_issue_id =~ /\A(#)?(\d+)\z/
-        parent_issue_id = $2.to_i
-        if $1
-          attributes['parent_issue_id'] = parent_issue_id
+      if parent_issue_id.start_with? '#'
+        # refers to existing issue
+        attributes['parent_issue_id'] = parent_issue_id[1..-1]
+      elsif use_unique_id?
+        # refers to other row with unique id
+        issue_id = items.where(:unique_id => parent_issue_id).first.try(:obj_id)
+
+        if issue_id
+          attributes['parent_issue_id'] = issue_id
         else
-          if parent_issue_id > item.position
-            add_callback(parent_issue_id, 'set_as_parent', item.position)
-          elsif issue_id = items.where(:position => parent_issue_id).first.try(:obj_id)
-            attributes['parent_issue_id'] = issue_id
-          end
+          add_callback(parent_issue_id, 'set_as_parent', item.position)
         end
+      elsif parent_issue_id =~ /\A\d+\z/
+        # refers to other row by position
+        parent_issue_id = parent_issue_id.to_i
+
+        if parent_issue_id > item.position
+          add_callback(parent_issue_id, 'set_as_parent', item.position)
+        elsif issue_id = items.where(:position => parent_issue_id).first.try(:obj_id)
+          attributes['parent_issue_id'] = issue_id
+        end
+
       else
+        # Something is odd. Assign parent_issue_id to trigger validation error
         attributes['parent_issue_id'] = parent_issue_id
       end
     end