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 @@

-
-<% if User.current.allowed_to?(:log_time_for_other_users, @import.project) %> +
+ <% if User.current.allowed_to?(:log_time_for_other_users, @import.project) %> +

+ + <%= mapping_select_tag @import, 'user', :required => true, + :values => @import.allowed_target_users.map {|u| [u.name, u.id]}, :default_value => "value:#{User.current.id}" %> +

+ <% end %>

- - <%= mapping_select_tag @import, 'user', :required => true, - :values => @import.allowed_target_users.map {|u| [u.name, u.id]}, :default_value => "value:#{User.current.id}" %> + + <%= mapping_select_tag @import, 'issue_id' %> +

+

+ + <%= mapping_select_tag @import, 'spent_on', :required => true %>

-<% end %> -

- - <%= mapping_select_tag @import, 'issue_id' %> -

-

- - <%= mapping_select_tag @import, 'spent_on', :required => true %> -

-

- - <%= mapping_select_tag @import, 'hours', :required => true %> -

-

- - <%= mapping_select_tag @import, 'comments' %> -

-
- -
-<% @custom_fields.each do |field| %>

- - <%= mapping_select_tag @import, "cf_#{field.id}", :required => field.is_required? %> + + <%= mapping_select_tag @import, 'hours', :required => true %>

-<% end %> +

+ + <%= mapping_select_tag @import, 'comments' %> +

+
+ +
+ <% @custom_fields.each do |field| %> +

+ + <%= mapping_select_tag @import, "cf_#{field.id}", :required => field.is_required? %> +

+ <% end %> +