From a4adf15c47119113ab2e93752042528e15fdecfd Mon Sep 17 00:00:00 2001
From: Sebastin Santy <sebastinssanty@gmail.com>
Date: Wed, 30 Aug 2017 02:32:50 +0530
Subject: Bug 1392769 - Add other fields to new-bug

---
 new_bug.cgi                               |  8 ++++-
 template/en/default/bug/new_bug.html.tmpl | 60 +++++++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/new_bug.cgi b/new_bug.cgi
index 6a49e0b68..4429717c1 100644
--- a/new_bug.cgi
+++ b/new_bug.cgi
@@ -58,6 +58,8 @@ if (lc($cgi->request_method) eq 'post') {
      check_hash_token($token, ['new_bug']);
      my @keywords = $cgi->param('keywords');
      my @groups = $cgi->param('groups');
+     my @cc = split /, /, $cgi->param('cc');
+     my @bug_mentor = split /, /, $cgi->param('bug_mentor');
      my $new_bug = Bugzilla::Bug->create({
                 short_desc   => scalar($cgi->param('short_desc')),
                 product      => scalar($cgi->param('product')),
@@ -68,8 +70,12 @@ if (lc($cgi->request_method) eq 'post') {
                 rep_platform => 'Unspecified',
                 version      => scalar( $cgi->param('version')),
                 keywords     => \@keywords,
-                cc           => [],
+                cc           => \@cc,
                 comment      => scalar($cgi->param('comment')),
+                dependson    => scalar($cgi->param('dependson')),
+                blocked      => scalar($cgi->param('blocked')),
+                assigned_to  => scalar($cgi->param('assigned_to')),
+                bug_mentors  => \@bug_mentor,
             });
      delete_token($token);
 
diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl
index 7acb85e21..fc75d4a3d 100644
--- a/template/en/default/bug/new_bug.html.tmpl
+++ b/template/en/default/bug/new_bug.html.tmpl
@@ -156,8 +156,64 @@
             [% bug.status_whiteboard == "" ? "---" : bug.status_whiteboard FILTER html %]
           [% END %]
         [% END %]
-      </div>
-      <div class="new-bug-pad">
+
+          [% WRAPPER bug_modal/module.html.tmpl
+            title = "People"
+            collapsed = 1
+          %]
+            [%# people %]
+            [% INCLUDE bug_modal/field.html.tmpl
+                field = bug_fields.assigned_to
+                field_type = constants.FIELD_TYPE_USER
+                edit_only = 1
+                editable = 1
+                help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#assigned_to"
+            %]
+            [% INCLUDE bug_modal/field.html.tmpl
+                field = bug_fields.bug_mentor
+                field_type = constants.FIELD_TYPE_USERS
+                name = "bug_mentors"
+                label = "Mentors"
+                edit_only = 1
+                editable = 1
+                help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#bug_mentor"
+            %]
+            [% INCLUDE bug_modal/field.html.tmpl
+                field = bug_fields.cc
+                field_type = constants.FIELD_TYPE_USERS
+                name = "cc"
+                label = "CC"
+                edit_only = 1
+                editable = 1
+                help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#cc"
+            %]
+          [% END %]
+
+          [% WRAPPER bug_modal/module.html.tmpl
+            title = "Dependency Tree"
+            collapsed = 1
+          %]
+          [%# depends on %]
+          [% INCLUDE bug_modal/field.html.tmpl
+              field = bug_fields.dependson
+              field_type = constants.FIELD_TYPE_FREETEXT
+              edit_only = 1
+              editable = 1
+              help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#dependson"
+          %]
+
+          [%# blocks %]
+          [% INCLUDE bug_modal/field.html.tmpl
+              field = bug_fields.blocked
+              field_type = constants.FIELD_TYPE_FREETEXT
+              edit_only = 1
+              editable = 1
+              help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#blocks"
+          %]
+          [% END %]
+        </div>
+        <div class="new-bug-pad">
+        </div>
       </div>
     </div>
   </div>
-- 
cgit v1.2.3-24-g4f1b