diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-06-07 18:23:42 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-06-07 18:23:42 +0000 |
| commit | e3875ffd5739a60e59f54ff431d2c0bf17f8a55e (patch) | |
| tree | 1d0fcbd0ad8fb4b155fb0df780403a3765f5f4c9 /app/views/imports | |
| parent | b935539f287a18924d510de8649f38fffdb85f50 (diff) | |
| download | redmine-e3875ffd5739a60e59f54ff431d2c0bf17f8a55e.tar.gz redmine-e3875ffd5739a60e59f54ff431d2c0bf17f8a55e.zip | |
Make Tracker map-able for CSV import (#22951).
git-svn-id: http://svn.redmine.org/redmine/trunk@15490 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/imports')
| -rw-r--r-- | app/views/imports/_fields_mapping.html.erb | 12 | ||||
| -rw-r--r-- | app/views/imports/mapping.html.erb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/imports/_fields_mapping.html.erb b/app/views/imports/_fields_mapping.html.erb index bb6467eca..4ac2b570f 100644 --- a/app/views/imports/_fields_mapping.html.erb +++ b/app/views/imports/_fields_mapping.html.erb @@ -1,17 +1,17 @@ -<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 %> diff --git a/app/views/imports/mapping.html.erb b/app/views/imports/mapping.html.erb index 283bddb04..2e225d6c2 100644 --- a/app/views/imports/mapping.html.erb +++ b/app/views/imports/mapping.html.erb @@ -35,7 +35,7 @@ <%= 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', |