1 files changed, 14 insertions, 3 deletions

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),