Fix for bug 98801: Implementation of the request tracker, a set of enhancements to attachment statuses.

r=gerv,bbaetz

5 files changed, 117 insertions, 8 deletions

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index bf93977ad..1981364f1 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -40,6 +40,10 @@
     to any [% parameters %] which you may have set before calling
     ThrowCodeError.
 
+  [% ELSIF error == "action_unrecognized" %]
+    I don't recognize the value (<em>[% variables.action FILTER html %]</em>)
+    of the <em>action</em> variable.
+  
   [% ELSIF error == "attachment_already_obsolete" %]
     Attachment #[% attachid FILTER html %] ([% description FILTER html %]) 
     is already obsolete.
@@ -78,10 +82,40 @@
   [% ELSIF error == "no_bug_data" %]
     No data when fetching bug [% bug_id %].
     
+  [% ELSIF error == "flag_nonexistent" %]
+    There is no flag with ID #[% variables.id %].
+  
+  [% ELSIF error == "flag_status_invalid" %]
+    The flag status <em>[% variables.status FILTER html %]</em> is invalid.
+  
+  [% ELSIF error == "flag_type_component_nonexistent" %]
+    The component <em>[% variables.component FILTER html %] does not exist
+    in the product <em>[% variables.product FILTER html %]</em>.
+  
+  [% ELSIF error == "flag_type_component_without_product" %]
+    A component was selected without a product being selected.
+  
+  [% ELSIF error == "flag_type_id_invalid" %]
+    The flag type ID <em>[% variables.id FILTER html %]</em> is not
+    a positive integer.
+
+  [% ELSIF error == "flag_type_nonexistent" %]
+    There is no flag type with the ID <em>[% variables.id %]</em>.
+  
+  [% ELSIF error == "flag_type_product_nonexistent" %]
+    The product <em>[% variables.product FILTER html %]</em> does not exist.
+  
+  [% ELSIF error == "flag_type_target_type_invalid" %]
+    The target type was neither <em>bug</em> nor <em>attachment</em>
+    but rather <em>[% variables.target_type FILTER html %]</em>.
+  
   [% ELSIF error == "no_y_axis_defined" %]
     No Y axis was defined when creating report. The X axis is optional,
     but the Y axis is compulsory.
     
+  [% ELSIF error == "request_queue_group_invalid" %]
+    The group field <em>[% group FILTER html %]</em> is invalid.
+
   [% ELSIF error == "template_error" %]
     [% template_error_msg %]
 
@@ -91,6 +125,14 @@
   [% ELSIF error == "unknown_action" %]
     Unknown action [% action FILTER html %]!
     
+  [% ELSIF error == "unknown_component" %]
+    [% title = "Unknown Component" %]
+    There is no component named <em>[% variables.component FILTER html %]</em>.
+
+  [% ELSIF error == "unknown_product" %]
+    [% title = "Unknown Product" %]
+    There is no product named <em>[% variables.product FILTER html %]</em>.
+
   [% ELSE %]
     [%# Give sensible error if error functions are used incorrectly.
       #%]        
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 584c4a93e..85c678fdc 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -81,6 +81,34 @@
     [% title = "Password Changed" %]
     Your password has been changed.
 
+  [% ELSIF message_tag == "flag_type_created" %]
+    [% title = "Flag Type Created" %]
+      The flag type <em>[% name FILTER html %]</em> has been created.
+      <a href="editflagtypes.cgi">Back to flag types.</a>
+    
+  [% ELSIF message_tag == "flag_type_changes_saved" %]
+    [% title = "Flag Type Changes Saved" %]
+    <p>
+      Your changes to the flag type <em>[% name FILTER html %]</em> 
+      have been saved.
+      <a href="editflagtypes.cgi">Back to flag types.</a>
+    </p>
+    
+  [% ELSIF message_tag == "flag_type_deleted" %]
+    [% title = "Flag Type Deleted" %]
+    <p>
+      The flag type <em>[% name FILTER html %]</em> has been deleted.
+      <a href="editflagtypes.cgi">Back to flag types.</a>
+    </p>
+    
+  [% ELSIF message_tag == "flag_type_deactivated" %]
+    [% title = "Flag Type Deactivated" %]
+    <p>
+      The flag type <em>[% flag_type.name FILTER html %]</em> 
+      has been deactivated.
+      <a href="editflagtypes.cgi">Back to flag types.</a>
+    </p>
+    
   [% ELSIF message_tag == "shutdown" %]
     [% title = "Bugzilla is Down" %]
     [% Param("shutdownhtml") %]
diff --git a/template/en/default/global/select-menu.html.tmpl b/template/en/default/global/select-menu.html.tmpl
index c27f60e8b..7b7fddb29 100644
--- a/template/en/default/global/select-menu.html.tmpl
+++ b/template/en/default/global/select-menu.html.tmpl
@@ -22,12 +22,18 @@
 [%# INTERFACE:
   # name: string; the name of the menu.
   #
+  # multiple: boolean; whether or not the menu is multi-select
+  #
+  # size: integer; if multi-select, the number of items to display at once
+  # 
   # options: array or hash; the items with which to populate the array.
   #   If a hash is passed, the hash keys become the names displayed
   #   to the user while the hash values become the value of the item.
   # 
   # default: string; the item selected in the menu by default.
   # 
+  # onchange: code; JavaScript to be run when the user changes the value
+  #   selected in the menu.
   #%]
  
 [%# Get the scalar representation of the options reference, 
@@ -37,7 +43,9 @@
   #%]
 [% options_type = BLOCK %][% options %][% END %]
 
-<select name="[% name FILTER html %]">
+<select name="[% name FILTER html %]" 
+        [% IF onchange %]onchange="[% onchange %]"[% END %]
+        [% IF multiple %] multiple [% IF size %] size="[% size %]" [% END %] [% END %]>
   [% IF options_type.search("ARRAY") %]
     [% FOREACH value = options %]
       <option value="[% value FILTER html %]"
@@ -45,7 +53,7 @@
         [% value FILTER html %]
       </option>
     [% END %]
-  [% ELSIF values_type.search("HASH") %]
+  [% ELSIF options_type.search("HASH") %]
     [% FOREACH option = options %]
       <option value="[% option.value FILTER html %]" 
               [% " selected" IF option.value == default %]>
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 1e5b09df1..785a9d75e 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -50,6 +50,8 @@
         <input name="id" size="6"> | 
         
         <a href="reports.cgi">Reports</a> 
+        
+        | <a href="request.cgi">Requests</a>
        
         [% IF user.login && Param('usevotes') %]
           | <a href="votes.cgi?action=show_user">My Votes</a>
@@ -68,7 +70,7 @@
                                                   || user.canblessany %]
         [% ', <a href="editproducts.cgi">products</a>' 
                                                 IF user.groups.editcomponents %]
-        [% ', <a href="editattachstatuses.cgi"> attachment&nbsp;statuses</a>'
+        [% ', <a href="editflagtypes.cgi">flags</a>'
                                                 IF user.groups.editcomponents %]
         [% ', <a href="editgroups.cgi">groups</a>' 
                                                   IF user.groups.creategroups %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c6f970df3..c9dca30d4 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -30,7 +30,7 @@
   #%]  
   
 [% DEFAULT title = "Error" %]
-  
+
 [% error_message = BLOCK %]
   [% IF    error == "aaa_example_error_tag" %]
     [% title = "Example Error" %]    
@@ -75,6 +75,10 @@
     Bug aliases cannot be longer than 20 characters.
     Please choose a shorter alias.
 
+  [% ELSIF error == "authorization_failure" %]
+    [% title = "Authorization Failed" %]
+    You are not allowed to [% action %].
+
   [% ELSIF error == "attachment_access_denied" %]
     [% title = "Access Denied" %]
     You are not permitted access to this attachment.
@@ -129,6 +133,23 @@
     format like JPG or PNG, or put it elsewhere on the web and
     link to it from the bug's URL field or in a comment on the bug.
       
+  [% ELSIF error == "flag_type_cc_list_invalid" %]
+    [% title = "Flag Type CC List Invalid" %]
+    The CC list [% cc_list FILTER html %] must be less than 200 characters long.
+    
+  [% ELSIF error == "flag_type_description_invalid" %]
+    [% title = "Flag Type Description Invalid" %]
+    The description must be less than 32K.
+    
+  [% ELSIF error == "flag_type_name_invalid" %]
+    [% title = "Flag Type Name Invalid" %]
+    The name <em>[% name FILTER html %]</em> must be 1-50 characters long.
+    
+  [% ELSIF error == "flag_type_sortkey_invalid" %]
+    [% title = "Flag Type Sort Key Invalid" %]
+    The sort key must be an integer between 0 and 32767 inclusive.
+    It cannot be <em>[% variables.sortkey %]</em>.
+  
   [% ELSIF error == "illegal_at_least_x_votes" %]
     [% title = "Your Query Makes No Sense" %]
     The <em>At least ___ votes</em> field must be a simple number. 
@@ -176,10 +197,6 @@
     [% title = "Invalid Attachment ID" %]
     The attachment id [% attach_id FILTER html %] is invalid.
 
-  [% ELSIF error == "invalid_attach_status" %]
-    [% title = "Invalid Attachment Status" %]
-    One of the statuses you entered is not a valid status for this attachment.
-    
   [% ELSIF error == "invalid_content_type" %]
     [% title = "Invalid Content-Type" %]
     The content type <em>[% contenttype FILTER html %]</em> is invalid.
@@ -281,6 +298,18 @@
     intentionally cleared out the "Reassign bug to" 
     field, [% Param("browserbugmessage") %]
 
+  [% ELSIF error == "requestee_too_short" %]
+    [% title = "Requestee Name Too Short" %]
+    One or two characters match too many users, so please enter at least 
+    three characters of the name/email address of the user you want to set 
+    the flag.
+  
+  [% ELSIF error == "requestee_too_many_matches" %]
+    [% title = "Requestee String Matched Too Many Times" %]
+      The string <em>[% requestee FILTER html %]</em> matched more than 
+      100 users.  Enter more of the name to bring the number of matches 
+      down to a reasonable amount.
+  
   [% ELSIF error == "unknown_keyword" %]
     [% title = "Unknown Keyword" %]
     <code>[% keyword FILTER html %]</code> is not a known keyword.