From 75c4c4f6b3fa799f06354467517d3f39cd9e945a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 6 Oct 2007 08:08:29 +0000 Subject: [PATCH] Content of projects/add_issue.rhtml and issues/edit.rhtml moved to a shared partial. git-svn-id: http://redmine.rubyforge.org/svn/trunk@811 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_form.rhtml | 48 +++++++++++++++++++++++++++++++++++ app/views/issues/edit.rhtml | 49 +++--------------------------------- app/views/projects/add_issue.rhtml | 51 +++----------------------------------- 3 files changed, 55 insertions(+), 93 deletions(-) create mode 100644 app/views/issues/_form.rhtml diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml new file mode 100644 index 00000000..28d2b97e --- /dev/null +++ b/app/views/issues/_form.rhtml @@ -0,0 +1,48 @@ +<%= error_messages_for 'issue' %> +
+ +
+<% if @issue.new_record? %> +

<%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %>

+<% else %> +

<%= @issue.status.name %>

+<% end %> + +

<%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %>

+

<%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %>

+

<%= 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') if authorize_for('projects', 'add_issue_category') %>

+
+ +
+

<%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %>

+

<%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %>

+

<%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %>

+

<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>

+
+ +

<%= f.text_field :subject, :size => 80, :required => true %>

+

<%= f.text_area :description, :required => true, :cols => 60, :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), :class => 'wiki-edit' %>

+

<%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %>

+<% for @custom_value in @custom_values %> +

<%= custom_field_tag_with_label @custom_value %>

+<% end %> + +<% if @issue.new_record? %> +

+<%= file_field_tag 'attachments[]', :size => 30 %> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)

+<% end %> +
+ +<%= wikitoolbar_for 'issue_description' %> + +<% content_for :header_tags do %> + <%= javascript_include_tag 'calendar/calendar' %> + <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %> + <%= javascript_include_tag 'calendar/calendar-setup' %> + <%= stylesheet_link_tag 'calendar' %> +<% end %> diff --git a/app/views/issues/edit.rhtml b/app/views/issues/edit.rhtml index b1f63d1f..9efaeb2e 100644 --- a/app/views/issues/edit.rhtml +++ b/app/views/issues/edit.rhtml @@ -1,48 +1,7 @@ -

<%= @issue.tracker.name %> #<%= @issue.id %>

+

<%=h "#{@issue.tracker.name} ##{@issue.id}" %>

<% labelled_tabular_form_for :issue, @issue, :url => {:action => 'edit'} do |f| %> -<%= error_messages_for 'issue' %> -
- -
-

<%= @issue.status.name %>

-

<%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %>

-

<%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %>

-

<%= 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') if authorize_for('projects', 'add_issue_category') %>

-
- -
-

<%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %>

-

<%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %>

-

<%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %>

-

<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>

-
- -
-

<%= f.text_field :subject, :size => 80, :required => true %>

-

<%= f.text_area :description, :required => true, :cols => 60, :rows => [[10, @issue.description.length / 50].max, 100].min, :class => 'wiki-edit' %>

- -<% for @custom_value in @custom_values %> -

<%= custom_field_tag_with_label @custom_value %>

+ <%= render :partial => 'form', :locals => {:f => f} %> + <%= f.hidden_field :lock_version %> + <%= submit_tag l(:button_save) %> <% end %> - -

<%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %>

-
- -
-<%= f.hidden_field :lock_version %> -<%= submit_tag l(:button_save) %> -<% end %> - -<%= wikitoolbar_for 'issue_description' %> - -<% content_for :header_tags do %> -<%= javascript_include_tag 'calendar/calendar' %> -<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %> -<%= javascript_include_tag 'calendar/calendar-setup' %> -<%= stylesheet_link_tag 'calendar' %> -<% end %> \ No newline at end of file diff --git a/app/views/projects/add_issue.rhtml b/app/views/projects/add_issue.rhtml index 0076d61b..f0dbead9 100644 --- a/app/views/projects/add_issue.rhtml +++ b/app/views/projects/add_issue.rhtml @@ -1,52 +1,7 @@

<%=l(:label_issue_new)%>: <%= @tracker.name %>

<% labelled_tabular_form_for :issue, @issue, :url => {:action => 'add_issue'}, :html => {:multipart => true} do |f| %> -<%= error_messages_for 'issue' %> -
- -<%= hidden_field_tag 'tracker_id', @tracker.id %> - -
-

<%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %>

-

<%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %>

-

<%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %>

-

<%= 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') if authorize_for('projects', 'add_issue_category') %>

-
-
-

<%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %>

-

<%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %>

-

<%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %>

-

<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>

-
- -
-

<%= f.text_field :subject, :size => 80, :required => true %>

-

<%= f.text_area :description, :cols => 60, :rows => 10, :required => true, :class => 'wiki-edit' %>

- -<% for @custom_value in @custom_values %> -

<%= custom_field_tag_with_label @custom_value %>

-<% end %> - -

<%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %>

- -

-<%= file_field_tag 'attachments[]', :size => 30 %> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)

-
- -
-<%= submit_tag l(:button_create) %> + <%= hidden_field_tag 'tracker_id', @tracker.id %> + <%= render :partial => 'issues/form', :locals => {:f => f} %> + <%= submit_tag l(:button_create) %> <% end %> - -<%= wikitoolbar_for 'issue_description' %> - -<% content_for :header_tags do %> -<%= javascript_include_tag 'calendar/calendar' %> -<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %> -<%= javascript_include_tag 'calendar/calendar-setup' %> -<%= stylesheet_link_tag 'calendar' %> -<% end %> \ No newline at end of file -- 2.11.0