Project

General

Profile

Defect #33027 » fix_missing_div.patch

Marius BĂLTEANU, 2020-02-20 07:32

View differences:

app/views/imports/_time_entries_fields_mapping.html.erb
11 11
</p>
12 12

  
13 13
<div class="splitcontent">
14
<div class="splitcontentleft">
15
<% if User.current.allowed_to?(:log_time_for_other_users, @import.project) %>
14
  <div class="splitcontentleft">
15
  <% if User.current.allowed_to?(:log_time_for_other_users, @import.project) %>
16
    <p>
17
      <label for="import_mapping_user"><%= l(:field_user) %></label>
18
      <%= mapping_select_tag @import, 'user', :required => true,
19
            :values => @import.allowed_target_users.map {|u| [u.name, u.id]}, :default_value => "value:#{User.current.id}" %>
20
    </p>
21
  <% end %>
16 22
  <p>
17
    <label for="import_mapping_user"><%= l(:field_user) %></label>
18
    <%= mapping_select_tag @import, 'user', :required => true,
19
          :values => @import.allowed_target_users.map {|u| [u.name, u.id]}, :default_value => "value:#{User.current.id}" %>
23
    <label for="import_mapping_issue_id"><%= l(:field_issue) %></label>
24
    <%= mapping_select_tag @import, 'issue_id' %>
25
  </p>
26
  <p>
27
    <label for="import_mapping_spent_on"><%= l(:field_spent_on) %></label>
28
    <%= mapping_select_tag @import, 'spent_on', :required => true %>
20 29
  </p>
21
<% end %>
22
<p>
23
  <label for="import_mapping_issue_id"><%= l(:field_issue) %></label>
24
  <%= mapping_select_tag @import, 'issue_id' %>
25
</p>
26
<p>
27
  <label for="import_mapping_spent_on"><%= l(:field_spent_on) %></label>
28
  <%= mapping_select_tag @import, 'spent_on', :required => true %>
29
</p>
30
<p>
31
  <label for="import_mapping_hours"><%= l(:field_hours) %></label>
32
  <%= mapping_select_tag @import, 'hours', :required => true %>
33
</p>
34
<p>
35
  <label for="import_mapping_comments"><%= l(:field_comments) %></label>
36
  <%= mapping_select_tag @import, 'comments' %>
37
</p>
38
</div>
39

  
40
<div class="splitcontentright">
41
<% @custom_fields.each do |field| %>
42 30
  <p>
43
    <label for="import_mapping_cf_<%= field.id %>"><%= field.name %></label>
44
    <%= mapping_select_tag @import, "cf_#{field.id}", :required => field.is_required? %>
31
    <label for="import_mapping_hours"><%= l(:field_hours) %></label>
32
    <%= mapping_select_tag @import, 'hours', :required => true %>
45 33
  </p>
46
<% end %>
34
  <p>
35
    <label for="import_mapping_comments"><%= l(:field_comments) %></label>
36
    <%= mapping_select_tag @import, 'comments' %>
37
  </p>
38
  </div>
39

  
40
  <div class="splitcontentright">
41
  <% @custom_fields.each do |field| %>
42
    <p>
43
      <label for="import_mapping_cf_<%= field.id %>"><%= field.name %></label>
44
      <%= mapping_select_tag @import, "cf_#{field.id}", :required => field.is_required? %>
45
    </p>
46
  <% end %>
47
  </div>
47 48
</div>
    (1-1/1)