jro_apps/redmine Commit - r14119:212f7ffe588e

Use same logic for finding user when importing a file (#950)....

Jean-Philippe Lang -

r14119:212f7ffe588e

parent child

Context file:

r14119:212f7ffe588e

Collapse all files

app/models/issue_import.rb +1 -1

             # 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 = issue.assignable_users.detect {|u| u.name.downcase == assignee_name.downcase}
+                  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 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

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	1	priority;subject;description;start_date;due_date;parent;private;progress;custom;version;category;user
2	High;First;First description;2015-07-08;2015-08-25;;no;;PostgreSQL;;New category	2	High;First;First description;2015-07-08;2015-08-25;;no;;PostgreSQL;;New category;dlopper
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;
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;

test/unit/issue_import_test.rb +9 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.
             require File.expand_path('../../test_helper', __FILE__)
             class IssueImportTest < ActiveSupport::TestCase
               fixtures :projects, :enabled_modules,
                        :users, :email_addresses,
                        :roles, :members, :member_roles,
                        :issues, :issue_statuses,
                        :trackers, :projects_trackers,
                        :versions,
                        :issue_categories,
                        :enumerations,
                        :workflows,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_projects,
                        :custom_fields_trackers
               def test_create_versions_should_create_missing_versions
                 import = generate_import_with_mapping
                 import.mapping.merge!('fixed_version' => '9', 'create_versions' => '1')
                 import.save!
                 version = new_record(Version) do
                   assert_difference 'Issue.count', 3 do
                     import.run
                   end
                 end
                 assert_equal '2.1', version.name
               end
               def test_create_categories_should_create_missing_categories
                 import = generate_import_with_mapping
                 import.mapping.merge!('category' => '10', 'create_categories' => '1')
                 import.save!
                 category = new_record(IssueCategory) do
                   assert_difference 'Issue.count', 3 do
                     import.run
                   end
                 end
                 assert_equal 'New category', category.name
               end
               def test_parent_should_be_set
                 import = generate_import_with_mapping
                 import.mapping.merge!('parent_issue_id' => '5')
                 import.save!
                 issues = new_records(Issue, 3) { import.run }
                 assert_nil issues[0].parent
                 assert_equal issues[0].id, issues[1].parent_id
                 assert_equal 2, issues[2].parent_id
               end
+              def test_assignee_should_be_set
+                import = generate_import_with_mapping
+                import.mapping.merge!('assigned_to' => '11')
+                import.save!
+                issues = new_records(Issue, 3) { import.run }
+                assert_equal [User.find(3), nil, nil], issues.map(&:assigned_to)
+              end
               def test_is_private_should_be_set_based_on_user_locale
                 import = generate_import_with_mapping
                 import.mapping.merge!('is_private' => '6')
                 import.save!
                 issues = new_records(Issue, 3) { import.run }
                 assert_equal [false, true, false], issues.map(&:is_private)
               end
               def test_dates_should_be_parsed_using_date_format_setting
                 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.save!
                 issue = new_record(Issue) { import.run } # only 1 valid issue
                 assert_equal "Valid dates", issue.subject
                 assert_equal Date.parse('2015-07-10'), issue.start_date
                 assert_equal Date.parse('2015-08-12'), issue.due_date
                 assert_equal '2015-07-14', issue.custom_field_value(field)
               end
               def test_date_format_should_default_to_user_language
                 user = User.generate!(:language => 'fr')
                 import = Import.new
                 import.user = user
                 assert_nil import.settings['date_format']
                 import.set_default_settings
                 assert_equal '%d/%m/%Y', import.settings['date_format']
               end
               def test_run_should_remove_the_file
                 import = generate_import_with_mapping
                 file_path = import.filepath
                 assert File.exists?(file_path)
                 import.run
                 assert !File.exists?(file_path)
               end
             end

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