Bug 351098: Make Bugzilla::Object able to update objects in the database, and make Bugzilla::Keyword use it

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=myk

5 files changed, 30 insertions, 29 deletions

diff --git a/template/en/default/admin/keywords/confirm-delete.html.tmpl b/template/en/default/admin/keywords/confirm-delete.html.tmpl
index bb29437ef..89123e2bf 100755
--- a/template/en/default/admin/keywords/confirm-delete.html.tmpl
+++ b/template/en/default/admin/keywords/confirm-delete.html.tmpl
@@ -18,12 +18,11 @@
   #
   # Contributor(s): Terry Weissman <terry@mozilla.org>
   #                 Vlad Dascalu <jocuri@softhome.net>
+  #                 Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
 [%# INTERFACE:
-  # name: string. The name of the keyword.
-  # keyword_id: number. The ID of the keyword.
-  # bug_count: number. The number of bugs with the keyword.
+  # keyword: A Bugzilla::Keyword object.
   #%]
 
 [% PROCESS global/header.html.tmpl
@@ -31,19 +30,19 @@
 %]
 
 <p>
-  [% IF bug_count == 1 %]
+  [% IF keyword.bug_count == 1 %]
     There is one [% terms.bug %] with this keyword set.
   [% ELSE %]
-    There are [% bug_count %] [%+terms.bugs %] with
+    There are [% keyword.bug_count FILTER html %] [%+ terms.bugs %] with
     this keyword set.
   [% END %]
   
   Are you <b>sure</b> you want to delete
-  the <code>[% name FILTER html %]</code> keyword?
+  the <code>[% keyword.name FILTER html %]</code> keyword?
 </p>
 
 <form method="post" action="editkeywords.cgi">
-  <input type="hidden" name="id" value="[% keyword_id %]">
+  <input type="hidden" name="id" value="[% keyword.id FILTER html %]">
   <input type="hidden" name="action" value="delete">
   <input type="hidden" name="reallydelete" value="1">
   <input type="submit" id="delete"
diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl
index b6b5fc932..0d3beaf33 100755
--- a/template/en/default/admin/keywords/edit.html.tmpl
+++ b/template/en/default/admin/keywords/edit.html.tmpl
@@ -18,13 +18,11 @@
   #
   # Contributor(s): Terry Weissman <terry@mozilla.org>
   #                 Vlad Dascalu <jocuri@softhome.net>
+  #                 Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
 [%# INTERFACE:
-  # keyword_id: number. The ID of the keyword.
-  # name: string. The name of the keyword.
-  # description: string. The description of the keyword.
-  # bug_count: number. The number of bugs with the keyword.
+  # keyword: A Bugzilla::Keyword object.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
@@ -37,7 +35,8 @@
   <table border="0" cellpadding="4" cellspacing="0">
     <tr>
       <th align="right">Name:</th>
-      <td><input size="64" maxlength="64" name="name" value="[% name FILTER html %]"></td>
+      <td><input size="64" maxlength="64" name="name" 
+                 value="[% keyword.name FILTER html %]"></td>
     </tr>
     <tr>
       <th align="right">Description:</th>
@@ -47,16 +46,16 @@
           minrows        = 4
           cols           = 64
           wrap           = 'virtual'
-          defaultcontent = description
+          defaultcontent = keyword.description
         %]
       </td>
     </tr>
     <tr>
       <th align="right">[% terms.Bugs %]:</th>
       <td>
-        [% IF bug_count > 0 %]
-          <a href="buglist.cgi?keywords=[% name FILTER url_quote %]">
-            [% bug_count %]</a>
+        [% IF keyword.bug_count > 0 %]
+          <a href="buglist.cgi?keywords=[% keyword.name FILTER url_quote %]">
+            [% keyword.bug_count FILTER html %]</a>
         [% ELSE %]
           none
         [% END %]
@@ -66,7 +65,7 @@
 
   <input type="submit" id="update" value="Update">
   <input type="hidden" name="action" value="update">
-  <input type="hidden" name="id" value="[% keyword_id %]">
+  <input type="hidden" name="id" value="[% keyword.id FILTER html %]">
 </form>
 
 <p><a href="editkeywords.cgi">Edit other keywords</a>.</p>
diff --git a/template/en/default/admin/keywords/rebuild-cache.html.tmpl b/template/en/default/admin/keywords/rebuild-cache.html.tmpl
index 84b7a7efa..f9f6f31c0 100755
--- a/template/en/default/admin/keywords/rebuild-cache.html.tmpl
+++ b/template/en/default/admin/keywords/rebuild-cache.html.tmpl
@@ -18,11 +18,12 @@
   #
   # Contributor(s): Terry Weissman <terry@mozilla.org>
   #                 Vlad Dascalu <jocuri@softhome.net>
+  #                 Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
 [%# INTERFACE:
   # action: string; the current action (either "update" or "delete").
-  # name: string; the name of the current keyword.
+  # keyword: A Bugzilla::Keyword object
   #%]
   
 [% IF action == "update" %]
@@ -35,7 +36,7 @@
 
 [% PROCESS global/header.html.tmpl %]
 
-Keyword [% name FILTER html %] [%+status FILTER html %].
+Keyword [% keyword.name FILTER html %] [%+ status FILTER html %].
 
 <p>
   <b>After you have finished deleting or modifying keywords,
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 2723b8dd9..9a7b3d50d 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -515,16 +515,6 @@
   'classification_text', 
 ],
 
-'admin/keywords/edit.html.tmpl' => [
-  'keyword_id',
-  'bug_count',
-],
-
-'admin/keywords/confirm-delete.html.tmpl' => [
-  'keyword_id',
-  'bug_count',
-],
-
 'admin/flag-type/confirm-delete.html.tmpl' => [
   'flag_type.flag_count',
   'flag_type.id', 
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 27798491b..a66524355 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -296,6 +296,18 @@
     a <code>[% param FILTER html %]</code> argument, and that
     argument was not set.
 
+  [% ELSIF error == "protection_violation" %]
+    The function <code>[% function FILTER html %]</code> was called
+    from
+   
+    [% IF caller %]
+        <code>[%+ caller FILTER html %]</code>, which is
+    [% END %]
+
+    outside the package. This function may only be called from
+    a subclass of <code>[% superclass FILTER html %]</code>.
+
+
   [% ELSIF error == "unknown_comparison_type" %]
     Specified comparison type is not supported.