Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-07 12:36:38 +02:00
Code Issues Packages Projects Releases Activity

Merged r15131 (#21867).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15203 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-03-12 09:56:40 +00:00
parent 18631c1da3
commit 361b65854c
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/issue_import.rb
View File

@@ -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

4
app/views/imports/_fields_mapping.html.erb
View File

@@ -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' %>

8
test/fixtures/files/import_issues.csv vendored
View File

@@ -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
1 priority subject description start_date due_date parent private progress custom version category user estimated_hours
2 High First First description 2015-07-08 2015-08-25 no PostgreSQL New category dlopper 1
3 Normal Child 1 Child description 1 yes 10 MySQL 2.0 New category 2
4 Normal Child of existing issue Child description #2 no 20 2.1 Printing 3