Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 980918 - Rename "Tags" to "Personal Tags". Patch by acho; r=gerv, a=justdave.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@265291 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-03-21 10:45:55 +00:00
parent 7a93e17c52
commit 673ec987f5
12 changed files with 24 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
8959
8960

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
1282244bf80703f541d19dca1c4733bff49275b0
9cd13d0ccbf870f53264a6cc0ea37a3097261ec6

20
mozilla/webtools/bugzilla/Bugzilla/Bug.pm
View File

@ -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

2
mozilla/webtools/bugzilla/Bugzilla/Field.pm
View File

@ -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'},
);

3
mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm
View File

@ -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) };
}

1
mozilla/webtools/bugzilla/enter_bug.cgi
View File

@ -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'));

13
mozilla/webtools/bugzilla/post_bug.cgi
View File

@ -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",

2
mozilla/webtools/bugzilla/skins/standard/global.css
View File

@ -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;
}

9
mozilla/webtools/bugzilla/template/en/default/bug/create/create.html.tmpl
View File

@ -625,15 +625,6 @@ 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">

33
mozilla/webtools/bugzilla/template/en/default/bug/field.html.tmpl
View File

@ -167,33 +167,32 @@
true);
</script>
[% CASE constants.FIELD_TYPE_BUG_URLS %]
[% 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>
[% '<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>
[% 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 %]"
[% IF !bug.id %]value="[% value FILTER html %]"[% END %]>
class="text_input" name="[% field.name FILTER html %]">
</div>
[% IF bug.id %]
<script type="text/javascript">
<script type="text/javascript">
setupEditLink('[% field.name FILTER js %]');
</script>
[% END %]
</script>
[% END %]
[% CASE constants.FIELD_TYPE_KEYWORDS %]
<div id="[% field.name FILTER html %]_container">

2
mozilla/webtools/bugzilla/template/en/default/global/field-descs.none.tmpl
View File

@ -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",

1
mozilla/webtools/bugzilla/template/en/default/list/table.html.tmpl
View File

@ -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 } ,