From 59c1141e08637a923a0aa80a86c8f8d6dbf0cb41 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 13 Dec 2011 20:02:49 +0000
Subject: [PATCH] Moved fields specific to new issues to the new issue form.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8199 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_form.html.erb | 12 ------------
 app/views/issues/new.html.erb   | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index b5274c289..d8dd91ee6 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -29,18 +29,6 @@
   <%= render :partial => 'issues/attributes' %>
 </div>
 
-<% if @issue.new_record? %>
-<p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
-<% end %>
-
-<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
-<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
-<% @issue.project.users.sort.each do |user| -%>
-<label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
-<% end -%>
-</p>
-<% end %>
-
 <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
 
 <%= wikitoolbar_for 'issue_description' %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index a6334391a..48d786879 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -4,10 +4,21 @@
 
 <% labelled_form_for @issue, :url => project_issues_path(@project),
                              :html => {:id => 'issue-form', :multipart => true} do |f| %>
-    <%= error_messages_for 'issue' %>
-    <div class="box tabular">
+  <%= error_messages_for 'issue' %>
+  <div class="box tabular">
     <%= render :partial => 'issues/form', :locals => {:f => f} %>
-    </div>
+
+    <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
+
+    <% if User.current.allowed_to?(:add_issue_watchers, @project) -%>
+      <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
+      <% @issue.project.users.sort.each do |user| -%>
+        <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
+      <% end -%>
+      </p>
+    <% end %>
+  </div>
+
     <%= submit_tag l(:button_create) %>
     <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
     <%= link_to_remote l(:label_preview),