Skip to content

bugzilla
bugzilla
Commit 5c0c85df authored by myk%mozilla.org's avatar myk%mozilla.org
Browse files
Options

Fix for bug 125660: Templatizes process_bug.cgi.

Patch by Myk Melez <myk@mozilla.org> r=gerv,bbaetz
parent 452bd0f6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 362 additions and 55 deletions
globals.pl
View file @ 5c0c85df
......@@ -373,61 +373,6 @@ sub lsearch {
return -1;
}
sub Product_element {
my ($prod,$onchange) = (@_);
return make_popup("product", keys %::versions, $prod, 1, $onchange);
}
sub Component_element {
my ($comp,$prod,$onchange) = (@_);
my $componentlist;
if (! defined $::components{$prod}) {
$componentlist = [];
} else {
$componentlist = $::components{$prod};
}
my $defcomponent;
if ($comp ne "" && lsearch($componentlist, $comp) >= 0) {
$defcomponent = $comp;
} else {
$defcomponent = $componentlist->[0];
}
return make_popup("component", $componentlist, $defcomponent, 1, "");
}
sub Version_element {
my ($vers, $prod, $onchange) = (@_);
my $versionlist;
if (!defined $::versions{$prod}) {
$versionlist = [];
} else {
$versionlist = $::versions{$prod};
}
my $defversion = $versionlist->[0];
if (lsearch($versionlist,$vers) >= 0) {
$defversion = $vers;
}
return make_popup("version", $versionlist, $defversion, 1, $onchange);
}
sub Milestone_element {
my ($tm, $prod, $onchange) = (@_);
my $tmlist;
if (!defined $::target_milestone{$prod}) {
$tmlist = [];
} else {
$tmlist = $::target_milestone{$prod};
}
my $deftm = $tmlist->[0];
if (lsearch($tmlist, $tm) >= 0) {
$deftm = $tm;
}
return make_popup("target_milestone", $tmlist, $deftm, 1, $onchange);
}
# Generate a string which, when later interpreted by the Perl compiler, will
# be the same as the given string.
......
template/default/global/hidden-fields.html.tmpl 0 → 100644
View file @ 5c0c85df
<!-- 1.0@bugzilla.org -->
[%# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Bugzilla Bug Tracking System.
#
# The Initial Developer of the Original Code is Netscape Communications
# Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s): Myk Melez <myk@mozilla.org>
#%]
[%# INTERFACE:
# form: hash; the form fields/values for which to generate hidden fields.
# exclude: string; a regular expression matching fields to exclude
# from the list of hidden fields generated by this template
#%]
[%# Generate hidden form fields for non-excluded fields. %]
[% FOREACH field = form %]
[% NEXT IF field.key.search(exclude) %]
<input type="hidden" name="[% field.key %]" value="[% field.value FILTER html %]">
[% END %]
template/default/process/confirm-dupe.html.tmpl 0 → 100644
View file @ 5c0c85df
<!-- 1.0@bugzilla.org -->
[%# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Bugzilla Bug Tracking System.
#
# The Initial Developer of the Original Code is Netscape Communications
# Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s): Myk Melez <myk@mozilla.org>
#%]
[%# INTERFACE:
# form: hash; the form values submitted to the script
# original_bug_id: number; the bug number for the bug
# against which a bug is being duped
# duplicate_bug_id: number; the bug number for the bug
# being duped
# cclist_accessible: boolean; whether or not users on the cc: list
# of the original bug can access that bug.
#%]
[% PROCESS global/header title="Duplicate Warning" %]
<p>
When marking a bug as a duplicate, the reporter of the duplicate
is normally added to the CC list of the original. The permissions
on bug [% original_bug_id %] (the original) are currently set
such that the reporter would not normally be able to see it.
</p>
<p>
<b>Adding the reporter to the CC list of bug [% original_bug_id %]
[% IF cclist_accessible %]
will immediately
[% ELSE %]
might, in the future,
[% END %]
allow him/her access to view this bug.</b>
Do you wish to do this?
</p>
<form method="post">
[% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
<p>
<input type="radio" name="confirm_add_duplicate" value="1">
Yes, add the reporter to CC list on bug [% original_bug_id %]
</p>
<p>
<input type="radio" name="confirm_add_duplicate" value="0" checked="checked">
No, do not add the reporter to CC list on bug [% original_bug_id %]
</p>
<p>
<a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes,
and revisit bug [% duplicate_bug_id %]</a>
<p>
<input type="submit" value="Submit">
</p>
</form>
[% PROCESS global/footer %]
template/default/process/mid-air.html.tmpl 0 → 100644
View file @ 5c0c85df
<!-- 1.0@bugzilla.org -->
[%# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Bugzilla Bug Tracking System.
#
# The Initial Developer of the Original Code is Netscape Communications
# Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s): Myk Melez <myk@mozilla.org>
#%]
[%# INTERFACE:
# form: hash; the form values submitted to the script
# operations: array; bug activity since the user last displayed the bug form,
# used by show/activity.html.tmpl to display recent changes that will be
# overwritten if the user submits these changes. See that template
# for further documentation.
# start_at: number; the comment at which show/comments.tmpl should begin
# displaying comments, either the index of the last comment (if the user
# entered a comment along with their change) or a number less than that
# (if they didn't), in which case no comments are displayed.
# comments: array; all the comments on the bug.
# bug_id: number; the ID of the bug being changed.
#%]
<h1>Mid-air collision detected!</h1>
<p>
Someone else has made changes to this bug at the same time you were trying to.
The changes made were:
</p>
<p>
[% PROCESS "show/activity.html.tmpl" incomplete_data=0 %]
</p>
[% IF comments.size > start_at %]
<p>
Added comments:
<blockquote>
[% PROCESS "show/comments.tmpl" %]
</blockquote>
</p>
[% END %]
<p>
You have the following choices:
</p>
<ul>
<li>
<form method="post">
[% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
<input type="submit" value="Submit my changes anyway">
This will cause all of the above changes to be overwritten
[% ", except for the added comment(s)" IF comments.size > start_at %].
</form>
</li>
<li>
<a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes,
and revisit bug [% bug_id %]</a>
</li>
</ul>
[% PROCESS global/footer %]
template/default/process/next-bug.html.tmpl 0 → 100644
View file @ 5c0c85df
<!-- 1.0@bugzilla.org -->
[%# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Bugzilla Bug Tracking System.
#
# The Initial Developer of the Original Code is Netscape Communications
# Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s): Myk Melez <myk@mozilla.org>
#%]
[%# INTERFACE:
# next_id : number; the ID of the next bug in the user's bug list.
#%]
<hr>
<p>
The next bug in your list is bug
<a href="show_bug.cgi?id=[% next_id %]">[% next_id %]</a>:
</p>
template/default/process/results.html.tmpl 0 → 100644
View file @ 5c0c85df
<!-- 1.0@bugzilla.org -->
[%# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Bugzilla Bug Tracking System.
#
# The Initial Developer of the Original Code is Netscape Communications
# Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s): Myk Melez <myk@mozilla.org>
#%]
[%# INTERFACE:
# id: number; the ID of the bug that was changed/checked.
#
# type: string; the type of change/check that was made: "bug" when a bug
# is changed, "dupe" when a duplication notation is added to a bug,
# and "dep" when a bug is checked for changes to its dependencies.
#%]
[% DEFAULT type="bug" %]
[%
title = {
'bug' => "Changes submitted for bug" ,
'dupe' => "Duplicate notation added to bug" ,
'dep' => "Checking for dependency changes on bug" ,
}
%]
<table border="1">
<tr>
<td>
<h2>[% title.$type %] [%+ id %]</h2>
[% mail %]
</td>
<td>
<a href="show_bug.cgi?id=[% id %]">Back To BUG# [% id %]</a>
</td>
</tr>
</table>
template/default/process/verify-new-product.html.tmpl 0 → 100644
View file @ 5c0c85df
<!-- 1.0@bugzilla.org -->
[%# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Bugzilla Bug Tracking System.
#
# The Initial Developer of the Original Code is Netscape Communications
# Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s): Myk Melez <myk@mozilla.org>
#%]
[%# INTERFACE:
# form: hash; the form values submitted to the script
# verify_fields: boolean; whether or not to verify
# the version, component, and target milestone fields
# versions: array; versions for the new product.
# components: array; components for the new product.
# milestones: array; milestones for the new product.
# verify_bug_group: boolean; whether or not to ask the user
# if they want to add the bug to its new product's group
# use_target_milestone: boolean; whether or not to use
# the target milestone field
#%]
[% USE mycgi = CGI %]
<form action="process_bug.cgi" method="post">
[% PROCESS "global/hidden-fields.html.tmpl" exclude="^version|component|target_milestone$" %]
[%# Verify the version, component, and target milestone fields. %]
[% IF verify_fields %]
<h3>Verify Version, Component[% ", Target Milestone" IF use_target_milestone %]</h3>
<p>
[% IF usetargetmilestone %]
You are moving the bug(s) to the product <b>[% form.product %]</b>,
and the version, component, and/or target milestone fields are no longer
correct. Please set the correct version, component, and target milestone now:
[% ELSE %]
You are moving the bug(s) to the product <b>[% form.product %]</b>,
and the version and component fields are no longer correct.
Please set the correct version and component now:
[% END %]
<p>
<table>
<tr>
<td>
<b>Version:</b><br>
[% mycgi.popup_menu(Name => "version" , Values => versions) %]
</td>
<td>
<b>Component:</b><br>
[% mycgi.popup_menu(Name => "component" , Values => components) %]
</td>
[% IF use_target_milestone %]
<td>
<b>Target Milestone:</b><br>
[% mycgi.popup_menu(Name => "target_milestone" , Values => milestones) %]
</td>
[% END %]
</tr>
</table>
[% END %]
[% IF verify_bug_group %]
<h3>Verify Bug Group</h3>
<p>
Do you want to add the bug to its new product's group (if any)?
</p>
<p>
<input type="radio" name="addtonewgroup" value="no"><b>no</b><br>
<input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br>
<input type="radio" name="addtonewgroup" value="yesifinold" checked>
<b>yes, but only if the bug was in its old product's group</b><br>
</p>
[% END %]
<input type="submit" value="Commit">
</form>
<hr>
<a href="query.cgi">Cancel and Return to the Query Page</a>
[% PROCESS global/footer %]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment