From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 26 Jul 2010 12:01:12 +0000 (+0200)
Subject: Bug 581798: Remove whitespaces from URLs when listing classifications and products... 
X-Git-Tag: bugzilla-3.7.3~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55b295957680e09791280624ceca417193f64723;p=thirdparty%2Fbugzilla.git

Bug 581798: Remove whitespaces from URLs when listing classifications and products in editproducts.cgi
r/a=mkanat
---

diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl
index 4eddad3060..77634e127f 100644
--- a/template/en/default/admin/products/list-classifications.html.tmpl
+++ b/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/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl
index 13f12780a7..93467df0e0 100644
--- a/template/en/default/admin/products/list.html.tmpl
+++ b/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%%'
      })
 %]