diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index dab8c3f5e0e..e29fee77c8f 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -8959 \ No newline at end of file +8960 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index 9e0fac08183..4a1b84196b3 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -1282244bf80703f541d19dca1c4733bff49275b0 \ No newline at end of file +9cd13d0ccbf870f53264a6cc0ea37a3097261ec6 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm index b53847790b2..f05533d2582 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm @@ -652,7 +652,6 @@ 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. @@ -716,25 +715,6 @@ 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/mozilla/webtools/bugzilla/Bugzilla/Field.pm b/mozilla/webtools/bugzilla/Bugzilla/Field.pm index fd71cc32133..1c9927bf479 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Field.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Field.pm @@ -254,7 +254,7 @@ use constant DEFAULT_FIELDS => ( {name => "owner_idle_time", desc => "Time Since Assignee Touched"}, {name => 'see_also', desc => "See Also", type => FIELD_TYPE_BUG_URLS}, - {name => 'tag', desc => 'Tags', buglist => 1, + {name => 'tag', desc => 'Personal Tags', buglist => 1, type => FIELD_TYPE_KEYWORDS}, {name => 'comment_tag', desc => 'Comment Tag'}, ); diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm index 09f6e1adc36..7c6547de91b 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm @@ -717,8 +717,7 @@ sub create { $dbh->bz_commit_transaction(); - $bug->send_changes(); - + Bugzilla::BugMail::Send($bug->bug_id, { changer => $bug->reporter }); return { id => $self->type('int', $bug->bug_id) }; } diff --git a/mozilla/webtools/bugzilla/enter_bug.cgi b/mozilla/webtools/bugzilla/enter_bug.cgi index 93997e665d0..da80e9d15b1 100755 --- a/mozilla/webtools/bugzilla/enter_bug.cgi +++ b/mozilla/webtools/bugzilla/enter_bug.cgi @@ -262,7 +262,6 @@ 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/mozilla/webtools/bugzilla/post_bug.cgi b/mozilla/webtools/bugzilla/post_bug.cgi index 782bb22939f..24fa331b48d 100755 --- a/mozilla/webtools/bugzilla/post_bug.cgi +++ b/mozilla/webtools/bugzilla/post_bug.cgi @@ -22,8 +22,6 @@ use Bugzilla::Hook; use Bugzilla::Token; use Bugzilla::Flag; -use List::MoreUtils qw(uniq); - my $user = Bugzilla->login(LOGIN_REQUIRED); my $cgi = Bugzilla->cgi; @@ -103,7 +101,7 @@ push(@bug_fields, qw( version target_milestone status_whiteboard - see_also + estimated_time deadline )); @@ -206,21 +204,12 @@ 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/mozilla/webtools/bugzilla/skins/standard/global.css b/mozilla/webtools/bugzilla/skins/standard/global.css index 13949edc4d5..ab8a44f6093 100644 --- a/mozilla/webtools/bugzilla/skins/standard/global.css +++ b/mozilla/webtools/bugzilla/skins/standard/global.css @@ -638,7 +638,7 @@ input.required, select.required, span.required_explanation { } .bug_urls { - margin: 0; + margin: 0 0 1em 0; padding: 0; list-style-type: none; } diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl index d3f56d00c41..05f1396460a 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl @@ -625,15 +625,6 @@ TUI_hide_default('attachment_text_field'); [% END %] - - - [% INCLUDE bug/field.html.tmpl - bug = default - field = bug_fields.see_also - editable = 1 - value = see_also - %] - diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/field.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/field.html.tmpl index b3b92e19828..f8612eebbf6 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/field.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/field.html.tmpl @@ -167,33 +167,32 @@ true); [% CASE constants.FIELD_TYPE_BUG_URLS %] - [% IF bug.id && value.size %] - + [% '' IF value.size %] + [% IF Param('use_see_also') %] (add)
+
+ class="text_input" name="[% field.name FILTER html %]">
- [% IF bug.id %] - - [% END %] + [% END %] [% CASE constants.FIELD_TYPE_KEYWORDS %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/field-descs.none.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/field-descs.none.tmpl index 2afabd0c66d..cbb6b641baa 100644 --- a/mozilla/webtools/bugzilla/template/en/default/global/field-descs.none.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/global/field-descs.none.tmpl @@ -123,7 +123,7 @@ "short_desc" => "Summary", "short_short_desc" => "Summary", "status_whiteboard" => "Whiteboard", - "tag" => "Tags", + "tag" => "Personal Tags", "target_milestone" => "Target Milestone", "version" => "Version", "work_time" => "Hours Worked", diff --git a/mozilla/webtools/bugzilla/template/en/default/list/table.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/table.html.tmpl index 28142593bf3..fe7678b0217 100644 --- a/mozilla/webtools/bugzilla/template/en/default/list/table.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/list/table.html.tmpl @@ -46,6 +46,7 @@ "short_short_desc" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , "status_whiteboard" => { maxlength => 0, title => "Whiteboard" , wrap => 1 } , "keywords" => { maxlength => 0, wrap => 1 } , + "tags" => { maxlength => 0, title => "Tags", wrap => 1}, "dependson" => { maxlength => 0, wrap => 1 } , "blocked" => { maxlength => 0, wrap => 1 } , "flagtypes.name" => { maxlength => 0, wrap => 1 } ,