Merged r19527 from trunk to 4.1-stable (#33027).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19535 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/imports/_time_entries_fields_mapping.html.erb b/app/views/imports/_time_entries_fields_mapping.html.erb
index 1b4f7a0e459ea898ab6d52a081c69a50e7fda9f4..65d6d0979afadc73fb81aaaaa64fcb17ec64f236 100644 (file)
--- 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_id"><%= l(:field_user) %></label>
+      <%= mapping_select_tag @import, 'user_id', :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_id"><%= l(:field_user) %></label>
-    <%= mapping_select_tag @import, 'user_id', :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>