diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index b5003c436b..1de979da07 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -59,13 +59,6 @@
<%= f.text_field :parent_issue_id, :size => 10, - :required => @issue.required_attribute?('parent_issue_id'), - :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %>
-<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript(auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks, :status => @issue.closed? ? 'c' : 'o', :issue_id => @issue.id))}')" %> -<% end %> - <% if @issue.safe_attribute? 'start_date' %><%= f.date_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %> @@ -80,13 +73,14 @@
<% end %> +<% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %> +<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %>
+<% end %> + <% if @issue.safe_attribute? 'estimated_hours' %><%= f.hours_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %>
<% end %> -<% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %> -<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %>
-<% end %><%= f.text_field :parent_issue_id, :size => 10, + :required => @issue.required_attribute?('parent_issue_id'), + :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %>
+<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript(auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks, :status => @issue.closed? ? 'c' : 'o', :issue_id => @issue.id))}')" %> +<% end %> + <% if @issue.safe_attribute?('tracker_id') || (@issue.persisted? && @issue.tracker_id_changed?) %><%= f.select :tracker_id, trackers_options_for_select(@issue), {:required => true}, @@ -29,6 +36,14 @@
<%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true %>
<% end %> +<%= f.label_for_field :description, :required => @issue.required_attribute?('description') %> @@ -45,10 +60,6 @@ <%= wikitoolbar_for 'issue_description', preview_issue_path(:project_id => @issue.project, :issue_id => @issue.id) %> <% end %> -