Bug 289580: Templatize the 'confirm delete' bit of editproducts.cgi - Patch by Tiago R. Mello <timello@async.com.br> r=LpSolit a=justdave

4 files changed, 333 insertions, 0 deletions

diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl
new file mode 100644
index 000000000..672f345e9
--- /dev/null
+++ b/template/en/default/admin/products/confirm-delete.html.tmpl
@@ -0,0 +1,282 @@
+[%# 1.0@bugzilla.org %]
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+  #%]
+
+[%# INTERFACE:
+  # product_name: string; The name of the product
+  #
+  # prod_description: string; Product description, may be empty
+  #
+  # (classification fields available if Param('useclassification') is enabled:)
+  #
+  # classification: string; The name of the classification the product is in
+  #
+  # class_description: string; Classification description, may be empty
+  #
+  # bug_count: number; The number of bugs belonging to the product
+  #
+  # milestoneurl: string; milestone url, if milestones are in use,
+  #                       may be empty
+  #
+  # disallownew: boolean; Are new bugs allowed for the product flag
+  #
+  # components: list of hashes, members are: name, description
+  #
+  # versions: list of version values.
+  #
+  # milestones: list of milestone values.
+  #
+  #%]
+
+[% title = BLOCK %]Delete Product '[% product_name FILTER html %]'
+[% END %]
+
+[% PROCESS global/header.html.tmpl
+  title = title
+  style_urls = ['skins/standard/admin.css']
+%]
+
+[% IF classification %]
+  [% classification_url_part = BLOCK %]&amp;classification=
+    [%- classification FILTER url_quote %]
+  [%- END %]
+[% ELSE %]
+  [% classification_url_part = "" %]
+[% END %]
+
+[% UNLESS class_description %]
+  [% class_description = '<span style="color: red">missing</span>' %]
+[% END %]
+[% UNLESS prod_description %]
+  [% prod_description = '<span style="color: red">missing</span>' %]
+[% END %]
+
+[% IF disallownew %]
+  [% disallownew = "closed" %]
+[% ELSE %]
+  [% disallownew = "open" %]
+[% END %]
+
+<table border="1" cellpadding="4" cellspacing="0">
+  <tr bgcolor="#6666FF">
+    <th valign="top" align="left">Field</th>
+    <th valign="top" align="left">Value</th>
+  </tr>
+
+  [% IF Param('useclassification') %]
+    <tr>
+      <td>Classification:</td>
+      <td>[% classification FILTER html %]</td>
+    </tr>
+    <tr>
+      <td>Classification Description:</td>
+      [%# descriptions are intentionally not filtered to allow html content %]
+      <td>[% class_description FILTER none %]</td>
+    </tr>
+  [% END %]
+
+  <tr>
+    <td valign="top">Product:</td>
+    <td valign="top">
+      <a href="editproducts.cgi?product=[% product_name FILTER url_quote %]
+         [%- classification_url_part %]">
+        [% product_name FILTER html %]
+      </a>
+    </td>
+  </tr>
+  <tr>
+    <td valign="top">Description:</td>
+    [%# descriptions are intentionally not filtered to allow html content %]
+    <td valign="top">[% prod_description FILTER none %]</td>
+  </tr>
+
+  [% IF Param('usetargetmilestone') %]
+    <tr>
+      <td>Milestone URL:</td>
+      <td>
+        [% IF milestoneurl %]
+          <a href="[% milestoneurl FILTER uri %]">
+            [%- milestoneurl FILTER html %]
+          </a>
+        [% ELSE %]
+          none
+        [% END %]
+      </td>
+    </tr>
+  [% END %]
+
+  <tr>
+    <td>Closed for [% terms.bugs %]:</td>
+    <td>[% disallownew FILTER html %]</td>
+  </tr>
+
+  <tr>
+    <td>
+      [% IF components.size > 0 %]
+        <a href="editcomponents.cgi?product=[% product_name FILTER url_quote %]
+           [%- classification_url_part %]"
+           title="Edit components for product '[% product_name FILTER html %]'">
+          Components:
+        </a>
+      [% ELSE %]
+        Components:
+      [% END %]
+    </td>
+    <td>
+      [% IF components.size > 0 %]
+        <table>
+          [% FOREACH c = components %]
+            <tr>
+              <th align="right">[% c.name FILTER html %]:</th>
+              [%# descriptions are intentionally not filtered to allow html content %]
+              <td>
+                [% IF c.description %]
+                  [% c.description FILTER none %]
+                [% ELSE %]
+                  <span style="color: red">missing</span>
+                [% END %]
+              </td>
+            </tr>
+          [% END %]
+        </table>
+      [% ELSE %]
+        none
+      [% END %]
+    </td>
+  </tr>
+
+  <tr>
+    <td>
+      [% IF versions.size > 0 %]
+        <a href="editversions.cgi?product=[%- product_name FILTER url_quote %]
+           [%- classification_url_part %]">
+          Versions:
+        </a>
+      [% ELSE %]
+        Versions:
+      [% END %]
+    <td>
+      [% IF versions.size > 0 %]
+        [% FOREACH v = versions %]
+          [% v FILTER html %]<br>
+        [% END %]
+      [% ELSE %]
+        none
+      [% END %]
+    </td>
+  </tr>
+
+  <tr>
+    <td valign="top">
+      [% IF milestones.size > 0 %]
+        <a href="editmilestones.cgi?product=[%- product_name FILTER url_quote %]
+           [%- classification_url_part -%]">
+          Milestones:
+        </a>
+      [% ELSE %]
+        Milestones:
+      [% END %]
+    </td>
+    <td>
+      [% IF milestones.size > 0 %]
+        [% FOREACH m = milestones %]
+          [% m FILTER html %]<br>
+        [% END %]
+      [% ELSE %]
+        none
+      [% END %]
+    </td>
+  </tr>
+
+  <tr>
+    <td>[% terms.Bugs %]:</td>
+    <td>
+      [% IF bug_count %]
+        <a href="buglist.cgi?product=[%- product_name FILTER url_quote %]
+           [%- classification_url_part %]"
+           title="List of [% terms.bugs %] for product '
+           [%- product_name FILTER html %]'">
+          [% bug_count %]
+        </a>
+      [% ELSE %]
+        none
+      [% END %]
+    </td>
+  </tr>
+</table>
+
+<h2>Confirmation</h2>
+
+[% IF bug_count %]
+
+  [% IF !Param("allowbugdeletion") %]
+
+    Sorry, there
+
+    [% IF bug_count > 1 %]
+      are [% bug_count %] [%+ terms.bugs %]
+    [% ELSE %]
+      is 1 [% terms.bug %]
+    [% END %]
+
+    outstanding for this product. You must reassign
+
+    [% IF bug_count > 1 %]
+       those [% terms.bugs %]
+    [% ELSE %]
+       that [% terms.bug %]
+    [% END %]
+
+    to another product before you can delete this one.
+
+  [% ELSE %]
+
+    <table border="0" cellpadding="20" width="70%" bgcolor="red">
+      <tr>
+        <td>
+          There
+          [% IF bug_count > 1 %]
+            are [% bug_count %] [%+ terms.bugs %]
+          [% ELSE %]
+            is 1 [% terms.bug %]
+          [% END %]
+          entered for this product!  When you delete this
+          product, <b><blink>ALL</blink></b> stored [% terms.bugs %] and
+          their history will be deleted, too.
+        </td>
+      </tr>
+    </table>
+
+  [% END %]
+
+[% END %]
+
+[% IF bug_count == 0 || Param('allowbugdeletion') %]
+
+  <p>Do you really want to delete this product?<p>
+
+  <form method="post" action="editproducts.cgi">
+    <input type="submit" value="Yes, delete">
+    <input type="hidden" name="action" value="delete">
+    <input type="hidden" name="product" value="[% product_name FILTER html %]">
+    <input type="hidden" name="classification"
+           value="[% classification FILTER html %]">
+  </form>
+
+[% END %]
+
+[% PROCESS admin/products/footer.html.tmpl %]
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/products/deleted.html.tmpl b/template/en/default/admin/products/deleted.html.tmpl
new file mode 100644
index 000000000..6b31dbb09
--- /dev/null
+++ b/template/en/default/admin/products/deleted.html.tmpl
@@ -0,0 +1,41 @@
+[%# 1.0@bugzilla.org %]
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # Contributor(s): Tiago R. Mello <timello@async.com.br>
+  #
+  #%]
+
+[% PROCESS global/header.html.tmpl
+  title = 'Deleting product'
+%]
+
+[% IF nb_bugs %]
+  All references to deleted [% terms.bugs %] removed.
+[% END %]
+
+<p>
+  Components deleted.<br>
+  Versions deleted.<br>
+  Milestones deleted.
+</p>
+
+<p>
+  Group controls deleted.<br>
+  Flag inclusions and exclusions deleted.
+</p>
+
+<p>
+  Product [% product FILTER html %] deleted.
+</p>
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 39de4fcac..bfa469481 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -535,6 +535,11 @@
   'classification_url_part', 
 ],
 
+'admin/products/confirm-delete.html.tmpl' => [
+  'classification_url_part', 
+  'bug_count', 
+],
+
 'admin/products/footer.html.tmpl' => [
   'classification_url_part', 
   'classification_text', 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 20d8371f4..800257ad9 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -234,6 +234,11 @@
     [% title = "Classification Does Not Exist" %]
     The classification '[% name FILTER html %]' does not exist.
 
+  [% ELSIF error == "classification_doesnt_exist_for_product" %]
+    [% title = "Classification Does Not Exist For Product" %]
+    The classification '[% classification FILTER html %]' does not exist
+    for product '[% product FILTER html %]'.
+
   [% ELSIF error == "classification_not_deletable" %]
     [% title = "Default Classification Can Not Be Deleted" %]
     You can not delete the default classification