Merge branch 'master' of ssh://git.mozilla.org/bugzilla/bugzilla

7 files changed, 62 insertions, 19 deletions

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index f05533d25..b53847790 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -652,6 +652,7 @@ sub create {
     my $blocked          = delete $params->{blocked};
     my $keywords         = delete $params->{keywords};
     my $creation_comment = delete $params->{comment};
+    my $see_also         = delete $params->{see_also};
 
     # We don't want the bug to appear in the system until it's correctly
     # protected by groups.
@@ -715,6 +716,25 @@ sub create {
         }
     }
 
+    # Insert any see_also values
+    if ($see_also) {
+        my $see_also_array = $see_also;
+        if (!ref $see_also_array) {
+            $see_also = trim($see_also);
+            $see_also_array = [ split(/[\s,]+/, $see_also) ];
+        }
+        foreach my $value (@$see_also_array) {
+            $bug->add_see_also($value);
+        }
+        foreach my $see_also (@{ $bug->see_also }) {
+            $see_also->insert_create_data($see_also);
+        }
+        foreach my $ref_bug (@{ $bug->{_update_ref_bugs} || [] }) {
+            $ref_bug->update();
+        }
+        delete $bug->{_update_ref_bugs};
+    }
+
     # Comment #0 handling...
 
     # We now have a bug id so we can fill this out
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 7c6547de9..09f6e1adc 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -717,7 +717,8 @@ sub create {
 
     $dbh->bz_commit_transaction();
 
-    Bugzilla::BugMail::Send($bug->bug_id, { changer => $bug->reporter });
+    $bug->send_changes();
+
     return { id => $self->type('int', $bug->bug_id) };
 }
 
diff --git a/enter_bug.cgi b/enter_bug.cgi
index da80e9d15..93997e665 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -262,6 +262,7 @@ else {
     $vars->{'blocked'}        = formvalue('blocked');
     $vars->{'deadline'}       = formvalue('deadline');
     $vars->{'estimated_time'} = formvalue('estimated_time');
+    $vars->{'see_also'}       = formvalue('see_also');
 
     $vars->{'cc'}             = join(', ', $cgi->param('cc'));
 
diff --git a/post_bug.cgi b/post_bug.cgi
index 24fa331b4..782bb2293 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -22,6 +22,8 @@ use Bugzilla::Hook;
 use Bugzilla::Token;
 use Bugzilla::Flag;
 
+use List::MoreUtils qw(uniq);
+
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
 my $cgi = Bugzilla->cgi;
@@ -101,7 +103,7 @@ push(@bug_fields, qw(
     version
     target_milestone
     status_whiteboard
-
+    see_also
     estimated_time
     deadline
 ));
@@ -204,12 +206,21 @@ my $bug_sent = Bugzilla::BugMail::Send($id, $recipients);
 $bug_sent->{type} = 'created';
 $bug_sent->{id}   = $id;
 my @all_mail_results = ($bug_sent);
+
 foreach my $dep (@{$bug->dependson || []}, @{$bug->blocked || []}) {
     my $dep_sent = Bugzilla::BugMail::Send($dep, $recipients);
     $dep_sent->{type} = 'dep';
     $dep_sent->{id}   = $dep;
     push(@all_mail_results, $dep_sent);
 }
+
+# Sending emails for any referenced bugs.
+foreach my $ref_bug_id (uniq @{ $bug->{see_also_changes} || [] }) {
+    my $ref_sent = Bugzilla::BugMail::Send($ref_bug_id, $recipients);
+    $ref_sent->{id} = $ref_bug_id;
+    push(@all_mail_results, $ref_sent);
+}
+
 $vars->{sentmail} = \@all_mail_results;
 
 $format = $template->get_format("bug/create/created",
diff --git a/skins/standard/global.css b/skins/standard/global.css
index ab8a44f60..13949edc4 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -638,7 +638,7 @@ input.required, select.required, span.required_explanation {
 }
 
 .bug_urls {
-    margin: 0 0 1em 0;
+    margin: 0;
     padding: 0;
     list-style-type: none;
 }
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 05f139646..d3f56d00c 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -625,6 +625,15 @@ TUI_hide_default('attachment_text_field');
       </td>
     </tr>
   [% END %]
+
+  <tr>
+    [% INCLUDE bug/field.html.tmpl
+       bug            = default
+       field          = bug_fields.see_also
+       editable       = 1
+       value          = see_also
+    %]
+  </tr>
 </tbody>
 
 <tbody class="expert_fields">
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index f8612eebb..b3b92e198 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -167,32 +167,33 @@
                            true);
        </script>
      [% CASE constants.FIELD_TYPE_BUG_URLS %]
-       [% '<ul class="bug_urls">' IF value.size %]
-       [% FOREACH bug_url = value %]
-         <li>
-           [% PROCESS bug_url_link bug_url = bug_url %]
-           <label><input type="checkbox" value="[% bug_url.name FILTER html %]"
-                         name="remove_[% field.name FILTER html %]">
-             Remove</label>
-         </li>
+       [% IF bug.id && value.size %]
+         <ul class="bug_urls">
+         [% FOREACH bug_url = value %]
+           <li>
+             [% PROCESS bug_url_link bug_url = bug_url %]
+             <label><input type="checkbox" value="[% bug_url.name FILTER html %]"
+                           name="remove_[% field.name FILTER html %]">
+               Remove</label>
+           </li>
+         [% END %]
+         </ul>
        [% END %]
-       [% '</ul>' IF value.size %]
-
        [% IF Param('use_see_also') %]
          <span id="container_showhide_[% field.name FILTER html %]"
                class="bz_default_hidden">
            (<a href="#" id="showhide_[% field.name FILTER html %]">add</a>)
          </span>
          <div id="container_[% field.name FILTER html %]">
-           <label for="[% field.name FILTER html %]">
-             <strong>Add [% terms.Bug %] URLs:</strong>
-           </label><br>
            <input type="text" id="[% field.name FILTER html %]" size="40"
-                  class="text_input" name="[% field.name FILTER html %]">
+                  class="text_input" name="[% field.name FILTER html %]"
+                  [% IF !bug.id %]value="[% value FILTER html %]"[% END %]>
          </div>
-         <script type="text/javascript">
+         [% IF bug.id %]
+           <script type="text/javascript">
              setupEditLink('[% field.name FILTER js %]');
-         </script>
+           </script>
+         [% END %]
        [% END %]
      [% CASE constants.FIELD_TYPE_KEYWORDS %]
        <div id="[% field.name FILTER html %]_container">