Bug 308150: admin/products/deleted.html.tmpl doesn't include admin/products/footer...

diff --git a/editproducts.cgi b/editproducts.cgi
index 66a16131b262ae56cf613f2b35f2c94c1498a00d..4572651c7493f4208e8ee841d752379f77e6605b 100755 (executable)
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -720,6 +720,7 @@ if ($action eq 'delete') {
                                   {product => $product});
 
     $vars->{'product'} = $product;
+    $vars->{'classification'} = $classification;
 
     my $bug_ids = $dbh->selectcol_arrayref(q{
         SELECT bug_id FROM bugs

diff --git a/template/en/default/admin/products/deleted.html.tmpl b/template/en/default/admin/products/deleted.html.tmpl
index 6b31dbb09a196216958b6e195fc2818f454ceeb6..3252f97c9d5848467aa8a5f71a126b163e4b5f6b 100644 (file)
--- a/template/en/default/admin/products/deleted.html.tmpl
+++ b/template/en/default/admin/products/deleted.html.tmpl
@@ -38,4 +38,8 @@
   Product [% product FILTER html %] deleted.
 </p>
 
+[% PROCESS admin/products/footer.html.tmpl
+           no_edit_product_link = 1
+%]
+
 [% PROCESS global/footer.html.tmpl %]

diff --git a/template/en/default/admin/products/footer.html.tmpl b/template/en/default/admin/products/footer.html.tmpl
index 2244c69a150192de3bc03935c2a7987209e5ef40..531e6c48ebceb1dd0696afae426c0c4fb1855488 100644 (file)
--- a/template/en/default/admin/products/footer.html.tmpl
+++ b/template/en/default/admin/products/footer.html.tmpl
@@ -28,10 +28,13 @@
   # no_add_product_link
   #%]
 
-[% IF classification %]
+[% IF Param('useclassification') && classification %]
   [% classification_url_part = BLOCK %]&classification=
      [%- classification FILTER url_quote %]
   [% END %]
+  [% classification_url_part_start = BLOCK %]classification=
+     [%- classification FILTER url_quote %]
+  [% END %]
   [% classification_text = BLOCK %] 
     of classification '[% classification FILTER html %]'
   [% END %]
@@ -61,16 +64,16 @@
          [% classification_text %]"
   href="editproducts.cgi?action=edit&product=
         [%- name FILTER url_quote %][% classification_url_part %]">
-        '[% name FILTER html %]'</a>
+        '[% name FILTER html %]'</a>.
 [% END %]
 
 
+[%# Edit other products (in a classification if specified): %]
 [% UNLESS no_edit_other_products_link %]
-  Edit other products [% classification_text %]<a 
-  href="editproducts.cgi?product=
-        [%- name FILTER url_quote %]
-        [%- classification_url_part %]">'
-        [%- classification FILTER html %]'</a>
+  Edit <a 
+  href="editproducts.cgi?
+        [%- classification_url_part_start FILTER none %]">other products
+          [% classification_text %]</a>.
    
 [% END %]