Patch for bug 103636: Support specifying a date on which a bug is expected to be resolved; patch by Alexandre Michetti Manduca <michetti@grad.icmc.usp.br>, r=jouni, a=myk.

7 files changed, 41 insertions, 0 deletions

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 0bc5c516c..e3551627b 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -218,6 +218,13 @@ function set_assign_to() {
       <input name="estimated_time" size="6" maxlength="6" value="0.0">
     </td>
   </tr>
+  <tr>
+    <td align="right"><strong>Deadline:</strong></td>
+    <td colspan="3">
+      <input name="deadline" size="10" maxlength="10">
+      <small>(YYYY-MM-DD)</small>
+    </td>
+  </tr>
 
   <tr>
     <td>&nbsp;</td>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 3a9fed0c7..0ba3638d8 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -380,6 +380,9 @@
         <th align="center" bgcolor="#cccccc">
           Gain
         </th>
+        <th align="center" bgcolor="#cccccc">
+          Deadline
+        </th>
       </tr>
       <tr>
         <td align="center">
@@ -410,6 +413,10 @@
         <td align="center">
           [% PROCESS formattimeunit time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %]
         </td>
+         <td align="center">
+           <input name="deadline" value="[% bug.deadline %]"
+                  size="10" maxlength="10">
+        </td>        
       </tr>
     </table>
   [% END %]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index a6c5fccea..a57445084 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -170,6 +170,8 @@
           [% PROCESS formattimeunit
                      time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %]
           &nbsp;
+          <b>Deadline:</b>&nbsp;
+          [% bug.deadline %]
         </td>
       </tr>
     [% END %]
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index b954c9176..3d5ba8fb1 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -337,6 +337,7 @@
 ],
 
 'bug/edit.html.tmpl' => [
+  'bug.deadline',
   'bug.remaining_time', 
   'bug.delta_ts', 
   'bug.bug_id', 
@@ -366,6 +367,7 @@
 
 'bug/show-multiple.html.tmpl' => [
   'bug.bug_id', 
+  'bug.deadline',
 ],
 
 'bug/show.xml.tmpl' => [
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index e49db6b5b..a1a22d7e8 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -38,6 +38,7 @@
                    "component_id"         => "Component ID",
                    "component"            => "Component",
                    "creation_ts"          => "$terms.Bug Creation time",
+                   "deadline"             => "Deadline",
                    "delta_ts"             => "Last Changed time",
                    "dependson"            => "Depends on",
                    "dup_id"               => "Duplicate",
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 6b922d0c2..7c6b40201 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -410,6 +410,9 @@
   [% ELSIF error == "illegal_date" %]
     [% title = "Illegal Date" %]
     '<tt>[% date FILTER html %]</tt>' is not a legal date.
+    [% IF format %]
+      Please use the format '<tt>[% format FILTER html %]</tt>'.
+    [% END %]
     
   [% ELSIF error == "illegal_email_address" %]
     [% title = "Invalid Email Address" %]
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index a3e0d68f5..35a85710d 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -304,6 +304,25 @@ function doOnSelectProduct(selectmode) {
       </td>
     </tr>
   [% END %]
+
+  [%# Deadline %]
+  [% IF UserInGroup(Param("timetrackinggroup")) %]
+    <tr>
+      <th align="right">
+        Dead<u>l</u>ine:
+      </th>
+      <td>
+        from&nbsp;
+        <input name="deadlinefrom" size="10" maxlength="10" accesskey="l">&nbsp;
+        to&nbsp;
+        <input name="deadlineto" size="10" maxlength="10">
+      </td>
+      <td>
+        <small>(YYYY-MM-DD)</small>
+      </td>
+    </tr>
+  [% END %]
+  
 </table>
 
 <hr>