jro_apps/redmine Commit - r15108:e3875ffd5739

Make Tracker map-able for CSV import (#22951)....

Jean-Philippe Lang -

r15108:e3875ffd5739

parent child

Context file:

r15108:e3875ffd5739

Collapse all files

app/controllers/imports_controller.rb +1 -5

                end
                def mapping
-                 issue = Issue.new
-                 issue.project = @import.project
-                 issue.tracker = @import.tracker
-                 @attributes = issue.safe_attribute_names
-                 @custom_fields = issue.editable_custom_field_values.map(&:custom_field)
+                 @custom_fields = @import.mappable_custom_fields
                  if request.post?
                    respond_to do |format|

app/helpers/imports_helper.rb +5 -1

                  blank_text = options[:required] ? "-- #{l(:actionview_instancetag_blank_option)} --" : "&nbsp;".html_safe
                  tags << content_tag('option', blank_text, :value => '')
                  tags << options_for_select(import.columns_options, import.mapping[field])
+                 if values = options[:values]
+                   tags << content_tag('option', '--', :disabled => true)
+                   tags << options_for_select(values.map {|text, value| [text, "value:#{value}"]}, import.mapping[field])
+                 end
                  tags
                end
                def mapping_select_tag(import, field, options={})
                  name = "import_settings[mapping][#{field}]"
-                 select_tag name, options_for_mapping_select(import, field, options)
+                 select_tag name, options_for_mapping_select(import, field, options), :id => "import_mapping_#{field}"
                end
                # Returns the options for the date_format setting

app/models/issue_import.rb +31 -3

                end
                def tracker
-                 tracker_id = mapping['tracker_id'].to_i
-                 allowed_target_trackers.find_by_id(tracker_id) || allowed_target_trackers.first
+                 if mapping['tracker'].to_s =~ /\Avalue:(\d+)\z/
+                   tracker_id = $1.to_i
+                   allowed_target_trackers.find_by_id(tracker_id)
+                 end
                end
                # Returns true if missing categories should be created during the import
                    mapping['create_versions'] == '1'
                end
+               def mappable_custom_fields
+                 if tracker
+                   issue = Issue.new
+                   issue.project = project
+                   issue.tracker = tracker
+                   issue.editable_custom_field_values(user).map(&:custom_field)
+                 elsif project
+                   project.all_issue_custom_fields
+                 else
+                   []
+                 end
+               end
                private
                def build_object(row)
                  issue.author = user
                  issue.notify = false
+                 tracker_id = nil
+                 if tracker
+                   tracker_id = tracker.id
+                 elsif tracker_name = row_value(row, 'tracker')
+                   tracker_id = allowed_target_trackers.named(tracker_name).first.try(:id)
+                 end
                  attributes = {
                    'project_id' => mapping['project_id'],
-                   'tracker_id' => mapping['tracker_id'],
+                   'tracker_id' => tracker_id,
                    'subject' => row_value(row, 'subject'),
                    'description' => row_value(row, 'description')
                  }
+                 attributes
                  issue.send :safe_attributes=, attributes, user
                  attributes = {}
                  end
                  issue.send :safe_attributes=, attributes, user
+                 if issue.tracker_id != tracker_id
+                   issue.tracker_id = nil
+                 end
                  issue
                end
              end

app/views/imports/_fields_mapping.html.erb +6 -6

-             <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' %>
+                     :id => 'import_mapping_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' %>
+               <%= mapping_select_tag @import, 'tracker', :required => true,
+                     :values => @import.allowed_target_trackers.sorted.map {|t| [t.name, t.id]} %>
              </p>
+             <div class="splitcontent">
+             <div class="splitcontentleft">
              <p>
                <label><%= l(:field_subject) %></label>
                <%= mapping_select_tag @import, 'subject', :required => true %>

app/views/imports/mapping.html.erb +1 -1

              <%= javascript_tag do %>
              $(document).ready(function() {
-               $('#fields-mapping').on('change', '#issue_project_id, #issue_tracker_id', function(){
+               $('#fields-mapping').on('change', '#import_mapping_project_id, #import_mapping_tracker', function(){
                  $.ajax({
                    url: '<%= import_mapping_path(@import, :format => 'js') %>',
                    type: 'post',

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

test/object_helpers.rb +1 -1

                  import.settings = {
                    'separator' => ";", 'wrapper' => '"', 'encoding' => "UTF-8",
-                   'mapping' => {'project_id' => '1', 'tracker_id' => '2', 'subject' => '1'}
+                   'mapping' => {'project_id' => '1', 'tracker' => '13', 'subject' => '1'}
                  }
                  import.save!
                  import

test/unit/issue_import_test.rb +32 -1

                  assert_equal 'New category', category.name
                end
+               def test_mapping_with_fixed_tracker
+                 import = generate_import_with_mapping
+                 import.mapping.merge!('tracker' => 'value:2')
+                 import.save!
+                 issues = new_records(Issue, 3) { import.run }
+                 assert_equal [2], issues.map(&:tracker_id).uniq
+               end
+               def test_mapping_with_mapped_tracker
+                 import = generate_import_with_mapping
+                 import.mapping.merge!('tracker' => '13')
+                 import.save!
+                 issues = new_records(Issue, 3) { import.run }
+                 assert_equal [1, 2, 1], issues.map(&:tracker_id)
+               end
+               def test_should_not_import_with_default_tracker_when_tracker_is_invalid
+                 Tracker.find_by_name('Feature request').update!(:name => 'Feature')
+                 import = generate_import_with_mapping
+                 import.mapping.merge!('tracker' => '13')
+                 import.save!
+                 import.run
+                 assert_equal 1, import.unsaved_items.count
+                 item = import.unsaved_items.first
+                 assert_include "Tracker cannot be blank", item.message
+               end
                def test_parent_should_be_set
                  import = generate_import_with_mapping
                  import.mapping.merge!('parent_issue_id' => '5')
                  field = IssueCustomField.generate!(:field_format => 'date', :is_for_all => true, :trackers => Tracker.all)
                  import = generate_import_with_mapping('import_dates.csv')
                  import.settings.merge!('date_format' => Import::DATE_FORMATS[1])
-                 import.mapping.merge!('subject' => '0', 'start_date' => '1', 'due_date' => '2', "cf_#{field.id}" => '3')
+                 import.mapping.merge!('tracker' => 'value:1', 'subject' => '0', 'start_date' => '1', 'due_date' => '2', "cf_#{field.id}" => '3')
                  import.save!
                  issue = new_record(Issue) { import.run } # only 1 valid issue

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