Merged r15131 (#21867).

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

diff --git a/app/models/issue_import.rb b/app/models/issue_import.rb
index 5a8748cd075f8ed2d7f500ed18d0a0a9235cdb4f..30b373adde795836baaa35642b94b620771951d2 100644 (file)
--- a/app/models/issue_import.rb
+++ b/app/models/issue_import.rb
@@ -128,6 +128,9 @@ class IssueImport < Import
     if due_date = row_date(row, 'due_date')
       attributes['due_date'] = due_date
     end
+    if estimated_hours = row_value(row, 'estimated_hours')
+      attributes['estimated_hours'] = estimated_hours
+    end
     if done_ratio = row_value(row, 'done_ratio')
       attributes['done_ratio'] = done_ratio
     end

diff --git a/app/views/imports/_fields_mapping.html.erb b/app/views/imports/_fields_mapping.html.erb
index 97dac0e6658df10d1439035b29e3ff460e156268..bb6467ecad7c13bbe320a0935c4a7186a40dbbb6 100644 (file)
--- a/app/views/imports/_fields_mapping.html.erb
+++ b/app/views/imports/_fields_mapping.html.erb
@@ -73,6 +73,10 @@
   <label><%= l(:field_due_date) %></label>
   <%= mapping_select_tag @import, 'due_date' %>
 </p>
+<p>
+  <label><%= l(:field_estimated_hours) %></label>
+  <%= mapping_select_tag @import, 'estimated_hours' %>
+</p>
 <p>
   <label><%= l(:field_done_ratio) %></label>
   <%= mapping_select_tag @import, 'done_ratio' %>

diff --git a/test/fixtures/files/import_issues.csv b/test/fixtures/files/import_issues.csv
index b648a42ba82305898ef7be4f03b84b717400cddd..918f9fc7ea8ce834f1f7ba69b69eac3324dd3af9 100644 (file)
--- a/test/fixtures/files/import_issues.csv
+++ b/test/fixtures/files/import_issues.csv
@@ -1,4 +1,4 @@
-priority;subject;description;start_date;due_date;parent;private;progress;custom;version;category;user
-High;First;First description;2015-07-08;2015-08-25;;no;;PostgreSQL;;New category;dlopper
-Normal;Child 1;Child description;;;1;yes;10;MySQL;2.0;New category;
-Normal;Child of existing issue;Child description;;;#2;no;20;;2.1;Printing;
+priority;subject;description;start_date;due_date;parent;private;progress;custom;version;category;user;estimated_hours
+High;First;First description;2015-07-08;2015-08-25;;no;;PostgreSQL;;New category;dlopper;1
+Normal;Child 1;Child description;;;1;yes;10;MySQL;2.0;New category;;2
+Normal;Child of existing issue;Child description;;;#2;no;20;;2.1;Printing;;3