diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-02-24 03:00:11 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-02-24 03:00:11 +0000 |
| commit | 3c45dfaad766f16fb082e68c8d4c8d6370b2fd47 (patch) | |
| tree | 62aec22bc45e915b9e8451e44b4397032c4b71c6 | |
| parent | f739dafaa4e394909849468274ff3143ef283e38 (diff) | |
| download | redmine-3c45dfaad766f16fb082e68c8d4c8d6370b2fd47.tar.gz redmine-3c45dfaad766f16fb082e68c8d4c8d6370b2fd47.zip | |
Fix missing closing div in app/views/imports/_time_entries_fields_mapping.html.erb (#33027).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@19527 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/imports/_time_entries_fields_mapping.html.erb | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/app/views/imports/_time_entries_fields_mapping.html.erb b/app/views/imports/_time_entries_fields_mapping.html.erb index c455d3b91..bc1e2ca3d 100644 --- a/app/views/imports/_time_entries_fields_mapping.html.erb +++ b/app/views/imports/_time_entries_fields_mapping.html.erb @@ -11,37 +11,38 @@ </p> <div class="splitcontent"> -<div class="splitcontentleft"> -<% if User.current.allowed_to?(:log_time_for_other_users, @import.project) %> + <div class="splitcontentleft"> + <% if User.current.allowed_to?(:log_time_for_other_users, @import.project) %> + <p> + <label for="import_mapping_user"><%= l(:field_user) %></label> + <%= mapping_select_tag @import, 'user', :required => true, + :values => @import.allowed_target_users.map {|u| [u.name, u.id]}, :default_value => "value:#{User.current.id}" %> + </p> + <% end %> <p> - <label for="import_mapping_user"><%= l(:field_user) %></label> - <%= mapping_select_tag @import, 'user', :required => true, - :values => @import.allowed_target_users.map {|u| [u.name, u.id]}, :default_value => "value:#{User.current.id}" %> + <label for="import_mapping_issue_id"><%= l(:field_issue) %></label> + <%= mapping_select_tag @import, 'issue_id' %> + </p> + <p> + <label for="import_mapping_spent_on"><%= l(:field_spent_on) %></label> + <%= mapping_select_tag @import, 'spent_on', :required => true %> </p> -<% end %> -<p> - <label for="import_mapping_issue_id"><%= l(:field_issue) %></label> - <%= mapping_select_tag @import, 'issue_id' %> -</p> -<p> - <label for="import_mapping_spent_on"><%= l(:field_spent_on) %></label> - <%= mapping_select_tag @import, 'spent_on', :required => true %> -</p> -<p> - <label for="import_mapping_hours"><%= l(:field_hours) %></label> - <%= mapping_select_tag @import, 'hours', :required => true %> -</p> -<p> - <label for="import_mapping_comments"><%= l(:field_comments) %></label> - <%= mapping_select_tag @import, 'comments' %> -</p> -</div> - -<div class="splitcontentright"> -<% @custom_fields.each do |field| %> <p> - <label for="import_mapping_cf_<%= field.id %>"><%= field.name %></label> - <%= mapping_select_tag @import, "cf_#{field.id}", :required => field.is_required? %> + <label for="import_mapping_hours"><%= l(:field_hours) %></label> + <%= mapping_select_tag @import, 'hours', :required => true %> </p> -<% end %> + <p> + <label for="import_mapping_comments"><%= l(:field_comments) %></label> + <%= mapping_select_tag @import, 'comments' %> + </p> + </div> + + <div class="splitcontentright"> + <% @custom_fields.each do |field| %> + <p> + <label for="import_mapping_cf_<%= field.id %>"><%= field.name %></label> + <%= mapping_select_tag @import, "cf_#{field.id}", :required => field.is_required? %> + </p> + <% end %> + </div> </div> |