##// END OF EJS Templates
Merged r14973 (#21219)....
Jean-Philippe Lang -
r14597:b7a16814cba2
parent child
Show More
@@ -1,79 +1,79
1 <%= labelled_fields_for :issue, @issue do |f| %>
1 <%= labelled_fields_for :issue, @issue do |f| %>
2
2
3 <div class="splitcontent">
3 <div class="splitcontent">
4 <div class="splitcontentleft">
4 <div class="splitcontentleft">
5 <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
5 <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
6 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
6 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
7 :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}')" %></p>
7 :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}')" %></p>
8 <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
8 <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
9 <% else %>
9 <% else %>
10 <p><label><%= l(:field_status) %></label> <%= @issue.status %></p>
10 <p><label><%= l(:field_status) %></label> <%= @issue.status %></p>
11 <% end %>
11 <% end %>
12
12
13 <% if @issue.safe_attribute? 'priority_id' %>
13 <% if @issue.safe_attribute? 'priority_id' %>
14 <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true} %></p>
14 <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true} %></p>
15 <% end %>
15 <% end %>
16
16
17 <% if @issue.safe_attribute? 'assigned_to_id' %>
17 <% if @issue.safe_attribute? 'assigned_to_id' %>
18 <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
18 <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
19 <% end %>
19 <% end %>
20
20
21 <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %>
21 <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %>
22 <p><%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true, :required => @issue.required_attribute?('category_id') %>
22 <p><%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true, :required => @issue.required_attribute?('category_id') %>
23 <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
23 <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
24 new_project_issue_category_path(@issue.project),
24 new_project_issue_category_path(@issue.project),
25 :remote => true,
25 :remote => true,
26 :method => 'get',
26 :method => 'get',
27 :title => l(:label_issue_category_new),
27 :title => l(:label_issue_category_new),
28 :tabindex => 200) if User.current.allowed_to?(:manage_categories, @issue.project) %></p>
28 :tabindex => 200) if User.current.allowed_to?(:manage_categories, @issue.project) %></p>
29 <% end %>
29 <% end %>
30
30
31 <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
31 <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
32 <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %>
32 <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %>
33 <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
33 <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
34 new_project_version_path(@issue.project),
34 new_project_version_path(@issue.project),
35 :remote => true,
35 :remote => true,
36 :method => 'get',
36 :method => 'get',
37 :title => l(:label_version_new),
37 :title => l(:label_version_new),
38 :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
38 :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
39 </p>
39 </p>
40 <% end %>
40 <% end %>
41 </div>
41 </div>
42
42
43 <div class="splitcontentright">
43 <div class="splitcontentright">
44 <% if @issue.safe_attribute? 'parent_issue_id' %>
44 <% if @issue.safe_attribute? 'parent_issue_id' %>
45 <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p>
45 <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p>
46 <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks)}')" %>
46 <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks)}')" %>
47 <% end %>
47 <% end %>
48
48
49 <% if @issue.safe_attribute? 'start_date' %>
49 <% if @issue.safe_attribute? 'start_date' %>
50 <p id="start_date_area">
50 <p id="start_date_area">
51 <%= f.text_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
51 <%= f.text_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
52 <%= calendar_for('issue_start_date') if @issue.leaf? %>
52 <%= calendar_for('issue_start_date') %>
53 </p>
53 </p>
54 <% end %>
54 <% end %>
55
55
56 <% if @issue.safe_attribute? 'due_date' %>
56 <% if @issue.safe_attribute? 'due_date' %>
57 <p id="due_date_area">
57 <p id="due_date_area">
58 <%= f.text_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
58 <%= f.text_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
59 <%= calendar_for('issue_due_date') if @issue.leaf? %>
59 <%= calendar_for('issue_due_date') %>
60 </p>
60 </p>
61 <% end %>
61 <% end %>
62
62
63 <% if @issue.safe_attribute? 'estimated_hours' %>
63 <% if @issue.safe_attribute? 'estimated_hours' %>
64 <p><%= f.text_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
64 <p><%= f.text_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
65 <% end %>
65 <% end %>
66
66
67 <% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
67 <% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
68 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
68 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
69 <% end %>
69 <% end %>
70 </div>
70 </div>
71 </div>
71 </div>
72
72
73 <% if @issue.safe_attribute? 'custom_field_values' %>
73 <% if @issue.safe_attribute? 'custom_field_values' %>
74 <%= render :partial => 'issues/form_custom_fields' %>
74 <%= render :partial => 'issues/form_custom_fields' %>
75 <% end %>
75 <% end %>
76
76
77 <% end %>
77 <% end %>
78
78
79 <% include_calendar_headers_tags %>
79 <% include_calendar_headers_tags %>
General Comments 0
You need to be logged in to leave comments. Login now