2 files changed, 5 insertions, 23 deletions

diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl
index 4eddad306..77634e127 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&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&classification=%%name%%' })
   %]
 [% END %]
 
diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl
index a9951dd74..0641c6283 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&product=%%name%%
-[% END %]
-[% delete_contentlink = BLOCK %]
-  editproducts.cgi?action=del&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&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&product=%%name%%'
      })
 %]