diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/_attributes.rhtml | 34 | ||||
| -rw-r--r-- | app/views/issues/_form.rhtml | 42 |
2 files changed, 39 insertions, 37 deletions
diff --git a/app/views/issues/_attributes.rhtml b/app/views/issues/_attributes.rhtml new file mode 100644 index 000000000..cfa14d52d --- /dev/null +++ b/app/views/issues/_attributes.rhtml @@ -0,0 +1,34 @@ +<% fields_for :issue, @issue, :builder => TabularFormBuilder do |f| %> + +<div class="splitcontentleft"> +<% if @issue.new_record? || @allowed_statuses.any? %> +<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p> +<% else %> +<p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p> +<% end %> + +<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p> +<p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p> +<% unless @project.issue_categories.empty? %> +<p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %> +<%= prompt_to_remote(l(:label_issue_category_new), + l(:label_issue_category_new), 'category[name]', + {:controller => 'projects', :action => 'add_issue_category', :id => @project}, + :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p> +<% end %> +<% unless @issue.assignable_versions.empty? %> +<p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), :include_blank => true %></p> +<% end %> +</div> + +<div class="splitcontentright"> +<p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p> +<p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p> +<p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p> +<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> +</div> + +<div style="clear:both;"> </div> +<%= render :partial => 'form_custom_fields' %> + +<% end %> diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml index c61c79d60..5337b51be 100644 --- a/app/views/issues/_form.rhtml +++ b/app/views/issues/_form.rhtml @@ -1,12 +1,9 @@ -<% if @issue.new_record? %> +<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>> <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p> -<%= observe_field :issue_tracker_id, :url => { :action => :new }, - :update => :content, +<%= observe_field :issue_tracker_id, :url => { :action => :update_form, :project_id => @project, :id => @issue }, + :update => :attributes, :with => "Form.serialize('issue-form')" %> -<hr /> -<% end %> -<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>> <p><%= f.text_field :subject, :size => 80, :required => true %></p> <p><%= f.text_area :description, :cols => 60, @@ -15,37 +12,8 @@ :class => 'wiki-edit' %></p> </div> -<div class="attributes"> -<div class="splitcontentleft"> -<% if @issue.new_record? || @allowed_statuses.any? %> -<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p> -<% else %> -<p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p> -<% end %> - -<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p> -<p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p> -<% unless @project.issue_categories.empty? %> -<p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %> -<%= prompt_to_remote(l(:label_issue_category_new), - l(:label_issue_category_new), 'category[name]', - {:controller => 'projects', :action => 'add_issue_category', :id => @project}, - :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p> -<% end %> -<% unless @issue.assignable_versions.empty? %> -<p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), :include_blank => true %></p> -<% end %> -</div> - -<div class="splitcontentright"> -<p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p> -<p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p> -<p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p> -<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> -</div> - -<div style="clear:both;"> </div> -<%= render :partial => 'form_custom_fields' %> +<div id="attributes" class="attributes"> + <%= render :partial => 'attributes' %> </div> <% if @issue.new_record? %> |