From 40dcf522e094f7d9944524dbc1ebafc61b6642c8 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 28 Sep 2005 05:08:11 +0000
Subject: Bug 307604: "Redisplay table with bug counts" should also be
 available from editmilestones.cgi and editversions.cgi - Patch by Frédéric
 Buclin <LpSolit@gmail.com> r=GavinS a=justdave
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en/default/admin/components/list.html.tmpl     |  8 ++----
 .../admin/components/select-product.html.tmpl      | 32 +++++++---------------
 2 files changed, 13 insertions(+), 27 deletions(-)

(limited to 'template/en/default/admin/components')

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>
-- 
cgit v1.2.3-24-g4f1b