From 76d18745d3a1d499bea403626539210cf7da052d Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 26 Jul 2010 12:18:44 +0000
Subject: [PATCH] Bug 581798: Remove whitespaces from URLs when listing
 classifications and products in editproducts.cgi r/a=mkanat

git-svn-id: svn://10.0.0.236/trunk@260892 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev               |  2 +-
 .../products/list-classifications.html.tmpl     | 11 ++---------
 .../en/default/admin/products/list.html.tmpl    | 17 +++--------------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 6dbdc88b7bb..2ce48870386 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7404
\ No newline at end of file
+7405
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/products/list-classifications.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/products/list-classifications.html.tmpl
index 4eddad30606..77634e127f5 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/products/list-classifications.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/products/list-classifications.html.tmpl
@@ -27,18 +27,11 @@
   title = "Select Classification"
 %]
 
-[% edit_contentlink = BLOCK %]
-  editproducts.cgi?classification=%%name%%
-[% END %]
-[% add_contentlink = BLOCK %]
-  editproducts.cgi?action=add&amp;classification=%%name%%
-[% END %]
-
 [% columns = [
      { 
        name => "name"
        heading => "Edit products of..."
-       contentlink => edit_contentlink
+       contentlink => 'editproducts.cgi?classification=%%name%%'
      },
      { 
        name => "description"
@@ -57,7 +50,7 @@
   [% columns.push({
        heading => "Action..."
        content => "Add product"
-       contentlink => add_contentlink })
+       contentlink => 'editproducts.cgi?action=add&amp;classification=%%name%%' })
   %]
 [% END %]
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/products/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/products/list.html.tmpl
index a9951dd743e..0641c6283ca 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/products/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/products/list.html.tmpl
@@ -37,22 +37,11 @@
   title = "Select product $classification_title"
 %]
 
-[% edit_contentlink = BLOCK %]
-  editproducts.cgi?action=edit&amp;product=%%name%%
-[% END %]
-[% delete_contentlink = BLOCK %]
-  editproducts.cgi?action=del&amp;product=%%name%%
-[% END %]
-[% bug_count_contentlink = BLOCK %]
-  buglist.cgi?product=%%name%%
-[% END %]
-
-
 [% columns = [
      { 
        name => "name"
        heading => "Edit product..."
-       contentlink => edit_contentlink
+       contentlink => 'editproducts.cgi?action=edit&amp;product=%%name%%'
      },
      { 
        name => "description"
@@ -72,7 +61,7 @@
        name => "bug_count"
        heading => "$terms.Bug Count"
        align => 'right'
-       contentlink => bug_count_contentlink
+       contentlink => 'buglist.cgi?product=%%name%%'
      })
   %]
 
@@ -81,7 +70,7 @@
 [% columns.push({
        heading => "Action"
        content => "Delete"
-       contentlink => delete_contentlink
+       contentlink => 'editproducts.cgi?action=del&amp;product=%%name%%'
      })
 %]