jro_apps/redmine Commit - r14749:81b681764ab7

Add column `estimated_hours` for CSV import (#21867)....

Jean-Philippe Lang -

r14749:81b681764ab7

parent child

Context file:

r14749:81b681764ab7

Collapse all files

app/models/issue_import.rb +3 0

             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueImport < Import
               # Returns the objects that were imported
               def saved_objects
                 object_ids = saved_items.pluck(:obj_id)
                 objects = Issue.where(:id => object_ids).order(:id).preload(:tracker, :priority, :status)
               end
               # Returns a scope of projects that user is allowed to
               # import issue to
               def allowed_target_projects
                 Project.allowed_to(user, :import_issues)
               end
               def project
                 project_id = mapping['project_id'].to_i
                 allowed_target_projects.find_by_id(project_id) || allowed_target_projects.first
               end
               # Returns a scope of trackers that user is allowed to
               # import issue to
               def allowed_target_trackers
                 project.trackers
               end
               def tracker
                 tracker_id = mapping['tracker_id'].to_i
                 allowed_target_trackers.find_by_id(tracker_id) || allowed_target_trackers.first
               end
               # Returns true if missing categories should be created during the import
               def create_categories?
                 user.allowed_to?(:manage_categories, project) &&
                   mapping['create_categories'] == '1'
               end
               # Returns true if missing versions should be created during the import
               def create_versions?
                 user.allowed_to?(:manage_versions, project) &&
                   mapping['create_versions'] == '1'
               end
               private
               def build_object(row)
                 issue = Issue.new
                 issue.author = user
                 issue.notify = false
                 attributes = {
                   'project_id' => mapping['project_id'],
                   'tracker_id' => mapping['tracker_id'],
                   'subject' => row_value(row, 'subject'),
                   'description' => row_value(row, 'description')
                 }
                 issue.send :safe_attributes=, attributes, user
                 attributes = {}
                 if priority_name = row_value(row, 'priority')
                   if priority_id = IssuePriority.active.named(priority_name).first.try(:id)
                     attributes['priority_id'] = priority_id
                   end
                 end
                 if issue.project && category_name = row_value(row, 'category')
                   if category = issue.project.issue_categories.named(category_name).first
                     attributes['category_id'] = category.id
                   elsif create_categories?
                     category = issue.project.issue_categories.build
                     category.name = category_name
                     if category.save
                       attributes['category_id'] = category.id
                     end
                   end
                 end
                 if assignee_name = row_value(row, 'assigned_to')
                   if assignee = Principal.detect_by_keyword(issue.assignable_users, assignee_name)
                     attributes['assigned_to_id'] = assignee.id
                   end
                 end
                 if issue.project && version_name = row_value(row, 'fixed_version')
                   if version = issue.project.versions.named(version_name).first
                     attributes['fixed_version_id'] = version.id
                   elsif create_versions?
                     version = issue.project.versions.build
                     version.name = version_name
                     if version.save
                       attributes['fixed_version_id'] = version.id
                     end
                   end
                 end
                 if is_private = row_value(row, 'is_private')
                   if yes?(is_private)
                     attributes['is_private'] = '1'
                   end
                 end
                 if parent_issue_id = row_value(row, 'parent_issue_id')
                   if parent_issue_id =~ /\A(#)?(\d+)\z/
                     parent_issue_id = $2
                     if $1
                       attributes['parent_issue_id'] = parent_issue_id
                     elsif issue_id = items.where(:position => parent_issue_id).first.try(:obj_id)
                       attributes['parent_issue_id'] = issue_id
                     end
                   else
                     attributes['parent_issue_id'] = parent_issue_id
                   end
                 end
                 if start_date = row_date(row, 'start_date')
                   attributes['start_date'] = start_date
                 end
                 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
                 attributes['custom_field_values'] = issue.custom_field_values.inject({}) do |h, v|
                   value = case v.custom_field.field_format
                   when 'date'
                     row_date(row, "cf_#{v.custom_field.id}")
                   else
                     row_value(row, "cf_#{v.custom_field.id}")
                   end
                   if value
                     h[v.custom_field.id.to_s] = v.custom_field.value_from_keyword(value, issue)
                   end
                   h
                 end
                 issue.send :safe_attributes=, attributes, user
                 issue
               end
             end

app/views/imports/_fields_mapping.html.erb +4 0

             <div class="splitcontent">
             <div class="splitcontentleft">
             <p>
               <label><%= l(:label_project) %></label>
               <%= select_tag 'import_settings[mapping][project_id]',
                     options_for_select(project_tree_options_for_select(@import.allowed_target_projects, :selected => @import.project)),
                     :id => 'issue_project_id' %>
             </p>
             <p>
               <label><%= l(:label_tracker) %></label>
               <%= select_tag 'import_settings[mapping][tracker_id]',
                     options_for_select(@import.allowed_target_trackers.sorted.map {|t| [t.name, t.id]}, @import.tracker.try(:id)),
                     :id => 'issue_tracker_id' %>
             </p>
             <p>
               <label><%= l(:field_subject) %></label>
               <%= mapping_select_tag @import, 'subject', :required => true %>
             </p>
             <p>
               <label><%= l(:field_description) %></label>
               <%= mapping_select_tag @import, 'description' %>
             </p>
             <p>
               <label><%= l(:field_priority) %></label>
               <%= mapping_select_tag @import, 'priority' %>
             </p>
             <p>
               <label><%= l(:field_category) %></label>
               <%= mapping_select_tag @import, 'category' %>
               <% if User.current.allowed_to?(:manage_categories, @import.project) %>
                 <label class="block">
                   <%= check_box_tag 'import_settings[mapping][create_categories]', '1', @import.create_categories? %>
                   <%= l(:label_create_missing_values) %>
                 </label>
               <% end %>
             </p>
             <p>
               <label><%= l(:field_assigned_to) %></label>
               <%= mapping_select_tag @import, 'assigned_to' %>
             </p>
             <p>
               <label><%= l(:field_fixed_version) %></label>
               <%= mapping_select_tag @import, 'fixed_version' %>
               <% if User.current.allowed_to?(:manage_versions, @import.project) %>
                 <label class="block">
                   <%= check_box_tag 'import_settings[mapping][create_versions]', '1', @import.create_versions? %>
                   <%= l(:label_create_missing_values) %>
                 </label>
               <% end %>
             </p>
             <% @custom_fields.each do |field| %>
               <p>
                 <label><%= field.name %></label>
                 <%= mapping_select_tag @import, "cf_#{field.id}" %>
               </p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <p>
               <label><%= l(:field_is_private) %></label>
               <%= mapping_select_tag @import, 'is_private' %>
             </p>
             <p>
               <label><%= l(:field_parent_issue) %></label>
               <%= mapping_select_tag @import, 'parent_issue_id' %>
             </p>
             <p>
               <label><%= l(:field_start_date) %></label>
               <%= mapping_select_tag @import, 'start_date' %>
             </p>
             <p>
               <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' %>
             </p>
             </div>
             </div>

test/fixtures/files/import_issues.csv +4 -4

@@ -1,4 +1,4
1	priority;subject;description;start_date;due_date;parent;private;progress;custom;version;category;user	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	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;	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;	4	Normal;Child of existing issue;Child description;;;#2;no;20;;2.1;Printing;;3

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages