Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

Fix missing closing div in app/views/imports/_time_entries_fields_mapping.html.erb (#33027).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19527 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-02-24 03:00:11 +00:00
parent f739dafaa4
commit 3c45dfaad7
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/views/imports/_time_entries_fields_mapping.html.erb
View File

@@ -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>
<% 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>
<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? %>
</p>
<% end %>
<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>