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