summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xeditmilestones.cgi3
-rwxr-xr-xeditversions.cgi4
-rw-r--r--template/en/default/admin/components/list.html.tmpl8
-rw-r--r--template/en/default/admin/components/select-product.html.tmpl32
-rw-r--r--template/en/default/admin/milestones/list.html.tmpl38
-rw-r--r--template/en/default/admin/milestones/select-product.html.tmpl31
-rw-r--r--template/en/default/admin/versions/list.html.tmpl40
-rw-r--r--template/en/default/admin/versions/select-product.html.tmpl31
-rw-r--r--template/en/default/filterexceptions.pl8
9 files changed, 122 insertions, 73 deletions
diff --git a/editmilestones.cgi b/editmilestones.cgi
index b9c4e0d51..3e484bbfc 100755
--- a/editmilestones.cgi
+++ b/editmilestones.cgi
@@ -53,6 +53,7 @@ my $product_name = trim($cgi->param('product') || '');
my $milestone_name = trim($cgi->param('milestone') || '');
my $sortkey = trim($cgi->param('sortkey') || 0);
my $action = trim($cgi->param('action') || '');
+my $showbugcounts = (defined $cgi->param('showbugcounts'));
#
# product = '' -> Show nice list of products
@@ -62,6 +63,7 @@ unless ($product_name) {
my @products = Bugzilla::Product::get_all_products();
+ $vars->{'showbugcounts'} = $showbugcounts;
$vars->{'products'} = \@products;
$template->process("admin/milestones/select-product.html.tmpl",
$vars)
@@ -81,6 +83,7 @@ unless ($action) {
my @milestones =
Bugzilla::Milestone::get_milestones_by_product($product->id);
+ $vars->{'showbugcounts'} = $showbugcounts;
$vars->{'product'} = $product->name;
$vars->{'milestones'} = \@milestones;
$vars->{'default_milestone'} = $product->default_milestone;
diff --git a/editversions.cgi b/editversions.cgi
index 66e81b864..d29e4d850 100755
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -62,6 +62,7 @@ $user->in_group('editcomponents')
my $product_name = trim($cgi->param('product') || '');
my $version_name = trim($cgi->param('version') || '');
my $action = trim($cgi->param('action') || '');
+my $showbugcounts = (defined $cgi->param('showbugcounts'));
#
# product = '' -> Show nice list of products
@@ -70,6 +71,8 @@ my $action = trim($cgi->param('action') || '');
unless ($product_name) {
my @products = Bugzilla::Product::get_all_products();
+
+ $vars->{'showbugcounts'} = $showbugcounts;
$vars->{'products'} = \@products;
$template->process("admin/versions/select-product.html.tmpl",
$vars)
@@ -88,6 +91,7 @@ unless ($action) {
my @versions =
Bugzilla::Version::get_versions_by_product($product->id);
+ $vars->{'showbugcounts'} = $showbugcounts;
$vars->{'product'} = $product->name;
$vars->{'versions'} = \@versions;
$template->process("admin/versions/list.html.tmpl",
diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl
index 71444936d..0b4998679 100644
--- a/template/en/default/admin/components/list.html.tmpl
+++ b/template/en/default/admin/components/list.html.tmpl
@@ -17,6 +17,7 @@
# Rights Reserved.
#
# Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+ # Frédéric Buclin <LpSolit@gmail.com>
#%]
[%# INTERFACE:
@@ -25,9 +26,6 @@
# product: string; the name of the product we are editing components for
#%]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
[% PROCESS global/variables.none.tmpl %]
[% title = BLOCK %]Select component of product
@@ -120,8 +118,8 @@
[% IF ! showbugcounts %]
-<p><a href="editcomponents.cgi?showbugcounts=1&amp;[% cgi.query_string %]">
- Redisplay table with [% terms.bug %] counts (slower)</a></p>
+ <p><a href="editcomponents.cgi?product=[% product FILTER url_quote %]&amp;showbugcounts=1">
+ Redisplay table with [% terms.bug %] counts (slower)</a></p>
[% END %]
diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl
index 7e6cb8be5..ea9342dcd 100644
--- a/template/en/default/admin/components/select-product.html.tmpl
+++ b/template/en/default/admin/components/select-product.html.tmpl
@@ -16,32 +16,22 @@
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
- # Contributor(s): Gavin Shelley (bugzilla@chimpychompy.org)
+ # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+ # Frédéric Buclin <LpSolit@gmail.com>
#
#%]
[%# INTERFACE:
- # products: array of hashes having the properties:
- # - name: string; The name of the product.
- # - description: string; The description of the product.
- # - bug_count: number; The number of bugs for the product (if
- # showbugcounts defined).
- #
+ # products: array of product objects
# showbugcounts: if defined, then bug counts should be included in the table
#%]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
[% PROCESS global/variables.none.tmpl %]
[% PROCESS global/header.html.tmpl
title = "Edit components for which product?"
%]
-[% bug_count_contentlink = BLOCK %]buglist.cgi?component=%%name%%&amp;product=
- [%- product FILTER url_quote %][% END %]
-
[% columns = [
{
name => "name"
@@ -58,26 +48,24 @@
[% IF showbugcounts %]
-[% columns.push({
+ [% columns.push({
name => 'bug_count'
heading => "$terms.Bugs"
align => "right"
- contentlink => bug_count_contentlink
- }) %]
+ contentlink => "buglist.cgi?product=%%name%%"
+ })
+ %]
[% END %]
[% PROCESS admin/table.html.tmpl
columns = columns
data = products
- footer = footer_row
%]
-[% IF ! showbugcounts %]
-
-<p><a href="editcomponents.cgi?showbugcounts=1&amp;[% cgi.query_string %]">
- Redisplay table with [% terms.bug %] counts (slower)</a></p>
-
+[% IF !showbugcounts %]
+ <p><a href="editcomponents.cgi?showbugcounts=1">
+ Redisplay table with [% terms.bug %] counts (slower)</a></p>
[% END %]
<p>
diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl
index d36b61a3d..b9311fc1a 100644
--- a/template/en/default/admin/milestones/list.html.tmpl
+++ b/template/en/default/admin/milestones/list.html.tmpl
@@ -17,13 +17,12 @@
# Rights Reserved.
#
# Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+ # Frédéric Buclin <LpSolit@gmail.com>
#%]
[%# INTERFACE:
- # milestones: array of hashes having the following properties:
- # - name: string; The name of the milestone.
- # - sortkey: number; The sortkey used to order the milestone.
- #
+ # milestones: array of milestone objects
+ # showbugcounts: if defined, then bug counts should be included in the table
# product: string; the name of the product we are editing milestones for
#%]
@@ -42,6 +41,8 @@
[%- product FILTER url_quote %]&amp;milestone=%%name%%[% END %]
[% delete_contentlink = BLOCK %]editmilestones.cgi?action=del&amp;product=
[%- product FILTER url_quote %]&amp;milestone=%%name%%[% END %]
+[% bug_count_contentlink = BLOCK %]buglist.cgi?target_milestone=%%name%%&amp;product=
+ [%- product FILTER url_quote %][% END %]
[% columns = [
@@ -53,14 +54,28 @@
{
name => "sortkey"
heading => "Sortkey"
- },
- {
+ }
+ ]
+%]
+
+[% IF showbugcounts %]
+
+ [% columns.push({
+ name => "bug_count"
+ heading => "$terms.Bugs"
+ align => "right"
+ contentlink => bug_count_contentlink
+ })
+ %]
+
+[% END %]
+
+[% columns.push({
name => "action"
heading => "Action"
content => "Delete"
contentlink => delete_contentlink
- }
- ]
+ })
%]
[%# We want to override the usual 'Delete' link for the default
@@ -83,6 +98,13 @@
<p>
+[% IF ! showbugcounts %]
+
+ <p><a href="editmilestones.cgi?product=[% product FILTER url_quote %]&amp;showbugcounts=1">
+ Redisplay table with [% terms.bug %] counts (slower)</a></p>
+
+[% END %]
+
[% PROCESS admin/milestones/footer.html.tmpl
no_edit_other_milestones_link = 1
%]
diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl
index b2510ded9..508af6881 100644
--- a/template/en/default/admin/milestones/select-product.html.tmpl
+++ b/template/en/default/admin/milestones/select-product.html.tmpl
@@ -16,28 +16,22 @@
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
- # Contributor(s): Gavin Shelley (bugzilla@chimpychompy.org)
+ # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+ # Frédéric Buclin <LpSolit@gmail.com>
#
#%]
[%# INTERFACE:
- # products: array of hashes having the following properties:
- # - name: string; The name of the product.
- # - description: string; The description of the product.
+ # products: array of product objects
+ # showbugcounts: if defined, then bug counts should be included in the table
#%]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
[% PROCESS global/variables.none.tmpl %]
[% PROCESS global/header.html.tmpl
title = "Edit milestones for which product?"
%]
-[% bug_count_contentlink = BLOCK %]buglist.cgi?target_milestone=%%name%%&amp;product=
- [%- product FILTER url_quote %][% END %]
-
[% columns = [
{
name => "name"
@@ -52,11 +46,28 @@
]
%]
+[% IF showbugcounts %]
+
+ [% columns.push({
+ name => 'bug_count'
+ heading => "$terms.Bugs"
+ align => "right"
+ contentlink => "buglist.cgi?product=%%name%%"
+ })
+ %]
+
+[% END %]
+
[% PROCESS admin/table.html.tmpl
columns = columns
data = products
%]
+[% IF !showbugcounts %]
+ <p><a href="editmilestones.cgi?showbugcounts=1">
+ Redisplay table with [% terms.bug %] counts (slower)</a></p>
+[% END %]
+
<p>
[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl
index ec47c18d7..b2ed2c343 100644
--- a/template/en/default/admin/versions/list.html.tmpl
+++ b/template/en/default/admin/versions/list.html.tmpl
@@ -17,18 +17,15 @@
# Rights Reserved.
#
# Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+ # Frédéric Buclin <LpSolit@gmail.com>
#%]
[%# INTERFACE:
- # versions: array of hashes having the following properties:
- # - name: string; The name of the version.
- #
+ # versions: array of version objects
+ # showbugcounts: if defined, then bug counts should be included in the table
# product: string; the name of the product we are editing versions for
#%]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
[% PROCESS global/variables.none.tmpl %]
[% title = BLOCK %]Select version of product
@@ -41,6 +38,8 @@
[%- product FILTER url_quote %]&amp;version=%%name%%[% END %]
[% delete_contentlink = BLOCK %]editversions.cgi?action=del&amp;product=
[%- product FILTER url_quote %]&amp;version=%%name%%[% END %]
+[% bug_count_contentlink = BLOCK %]buglist.cgi?version=%%name%%&amp;product=
+ [%- product FILTER url_quote %][% END %]
[% columns = [
@@ -48,13 +47,27 @@
name => "name"
heading => "Edit version..."
contentlink => edit_contentlink
- },
- {
+ }
+ ]
+%]
+
+[% IF showbugcounts %]
+
+ [% columns.push({
+ name => "bug_count"
+ heading => "$terms.Bugs"
+ align => "right"
+ contentlink => bug_count_contentlink
+ })
+ %]
+
+[% END %]
+
+[% columns.push({
heading => "Action"
content => "Delete"
contentlink => delete_contentlink
- }
- ]
+ })
%]
[% PROCESS admin/table.html.tmpl
@@ -64,6 +77,13 @@
<p>
+[% IF ! showbugcounts %]
+
+ <p><a href="editversions.cgi?product=[% product FILTER url_quote %]&amp;showbugcounts=1">
+ Redisplay table with [% terms.bug %] counts (slower)</a></p>
+
+[% END %]
+
[% PROCESS admin/versions/footer.html.tmpl
no_edit_other_versions_link = 1
%]
diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl
index 621649cd2..cba4bab4e 100644
--- a/template/en/default/admin/versions/select-product.html.tmpl
+++ b/template/en/default/admin/versions/select-product.html.tmpl
@@ -16,28 +16,22 @@
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
- # Contributor(s): Gavin Shelley (bugzilla@chimpychompy.org)
+ # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+ # Frédéric Buclin <LpSolit@gmail.com>
#
#%]
[%# INTERFACE:
- # products: array of hashes having the following properties:
- # - name: string; The name of the product.
- # - description: string; The description of the product.
+ # products: array of product objects
+ # showbugcounts: if defined, then bug counts should be included in the table
#%]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
[% PROCESS global/variables.none.tmpl %]
[% PROCESS global/header.html.tmpl
title = "Edit versions for which product?"
%]
-[% bug_count_contentlink = BLOCK %]buglist.cgi?version=%%name%%&amp;product=
- [%- product FILTER url_quote %][% END %]
-
[% columns = [
{
name => "name"
@@ -52,11 +46,28 @@
]
%]
+[% IF showbugcounts %]
+
+ [% columns.push({
+ name => 'bug_count'
+ heading => "$terms.Bugs"
+ align => "right"
+ contentlink => "buglist.cgi?product=%%name%%"
+ })
+ %]
+
+[% END %]
+
[% PROCESS admin/table.html.tmpl
columns = columns
data = products
%]
+[% IF !showbugcounts %]
+ <p><a href="editversions.cgi?showbugcounts=1">
+ Redisplay table with [% terms.bug %] counts (slower)</a></p>
+[% END %]
+
<p>
[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index bb4582260..d03a772c4 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -611,14 +611,6 @@
'comp.bug_count'
],
-'admin/components/list.html.tmpl' => [
- 'cgi.query_string'
-],
-
-'admin/components/select-product.html.tmpl' => [
- 'cgi.query_string'
-],
-
'admin/milestones/confirm-delete.html.tmpl' => [
'bug_count'
],