##// END OF EJS Templates
Fixed that timelog comments are not visible on the responsive issue edit form (#19097)....
Jean-Philippe Lang -
r14465:161558e9d0d6
parent child
Show More
@@ -1,52 +1,54
1 1 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
2 2 <%= error_messages_for 'issue', 'time_entry' %>
3 3 <%= render :partial => 'conflict' if @conflict %>
4 4 <div class="box">
5 5 <% if @issue.attributes_editable? %>
6 6 <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
7 7 <div id="all_attributes">
8 8 <%= render :partial => 'form', :locals => {:f => f} %>
9 9 </div>
10 10 </fieldset>
11 11 <% end %>
12 12 <% if User.current.allowed_to?(:log_time, @project) %>
13 13 <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
14 14 <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
15 <div class="splitcontent">
15 16 <div class="splitcontentleft">
16 17 <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
17 18 </div>
18 19 <div class="splitcontentright">
19 20 <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
20 21 </div>
22 </div>
21 23 <p><%= time_entry.text_field :comments, :size => 60 %></p>
22 24 <% @time_entry.custom_field_values.each do |value| %>
23 25 <p><%= custom_field_tag_with_label :time_entry, value %></p>
24 26 <% end %>
25 27 <% end %>
26 28 </fieldset>
27 29 <% end %>
28 30
29 31 <fieldset><legend><%= l(:field_notes) %></legend>
30 32 <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
31 33 <%= wikitoolbar_for 'issue_notes' %>
32 34
33 35 <% if @issue.safe_attribute? 'private_notes' %>
34 36 <%= f.check_box :private_notes, :no_label => true %> <label for="issue_private_notes"><%= l(:field_private_notes) %></label>
35 37 <% end %>
36 38
37 39 <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
38 40 </fieldset>
39 41
40 42 <fieldset><legend><%= l(:label_attachment_plural) %></legend>
41 43 <p><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>
42 44 </fieldset>
43 45 </div>
44 46
45 47 <%= f.hidden_field :lock_version %>
46 48 <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
47 49 <%= submit_tag l(:button_submit) %>
48 50 <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
49 51 | <%= link_to l(:button_cancel), {}, :onclick => "$('#update').hide(); return false;" %>
50 52 <% end %>
51 53
52 54 <div id="preview" class="wiki"></div>
General Comments 0
You need to be logged in to leave comments. Login now