diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 432800f99..82824b85f 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -1,12 +1,12 @@ <% labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %> <%= error_messages_for 'issue', 'time_entry' %> - <%= render :partial => 'conflict' if @conflict %> + <%= render :partial => 'conflict' if @conflict %>
<% if @edit_allowed || !@allowed_statuses.empty? %>
<%= l(:label_change_properties) %> -
+
<%= render :partial => 'form', :locals => {:f => f} %> -
+
<% end %> <% if User.current.allowed_to?(:log_time, @project) %>