From 8cb6f0fa771a8c3c2374c8b2fcb7d4f2e5048ed5 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Thu, 14 Jun 2007 21:35:54 +0000
Subject: Bug 101179: Fully implement support for customised bug statuses and
 workflow (final checkin!) - Patch by Frédéric Buclin <LpSolit@gmail.com>
 r=gerv a=justdave
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en/default/admin/fieldvalues/create.html.tmpl     | 19 +++++++++++++++++++
 .../en/default/admin/fieldvalues/created.html.tmpl    |  5 +++++
 template/en/default/admin/fieldvalues/edit.html.tmpl  |  7 ++++++-
 template/en/default/global/user-error.html.tmpl       |  6 ++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/en/default/admin/fieldvalues/create.html.tmpl b/template/en/default/admin/fieldvalues/create.html.tmpl
index 9a0ac993e..61ca62ebf 100644
--- a/template/en/default/admin/fieldvalues/create.html.tmpl
+++ b/template/en/default/admin/fieldvalues/create.html.tmpl
@@ -12,6 +12,7 @@
   # The Original Code is the Bugzilla Bug Tracking System.
   #
   # Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
   #%]
 
 [%# INTERFACE:
@@ -41,6 +42,24 @@
       <td><input id="sortkey" size="10" maxlength="20" name="sortkey"
                  value=""></td>
     </tr>
+    [% IF field.name == "bug_status" %]
+      <tr>
+        <th align="right"><label for="is_open">Status Type:</label></th>
+        <td>
+          <input type="radio" id="open_status" name="is_open" value="1" checked="checked">
+          <label for="open_status">Open</label><br>
+          <input type="radio" id="closed_status" name="is_open" value="0">
+          <label for="closed_status">Closed (requires a Resolution)</label>
+        </td>
+      </tr>
+      <tr>
+        <th>&nbsp;</th>
+        <td>
+          Note: The open/close attribute can only be set now, when you create
+          the status. It cannot be edited later.
+        </td>
+      </tr>
+    [% END %]
   </table>
   <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
diff --git a/template/en/default/admin/fieldvalues/created.html.tmpl b/template/en/default/admin/fieldvalues/created.html.tmpl
index b3d60f081..f06923677 100644
--- a/template/en/default/admin/fieldvalues/created.html.tmpl
+++ b/template/en/default/admin/fieldvalues/created.html.tmpl
@@ -34,6 +34,11 @@
    [%- value FILTER html %]</a>' has been added as a valid choice for
    the '[% field.description FILTER html %]' field.</p>
 
+[% IF field.name == "bug_status" %]
+  You should now visit the <a href="editworkflow.cgi">status workflow page</a>
+  to include your new [% terms.bug %] status.
+[% END %]
+
 [% PROCESS admin/fieldvalues/footer.html.tmpl %]
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index 919ac090c..efce7b255 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -50,7 +50,12 @@
       <td><input id="sortkey" size="20" maxlength="20" name="sortkey" value="
       [%- sortkey FILTER html %]"></td>
     </tr>
-
+    [% IF field.name == "bug_status" %]
+      <tr>
+        <th align="right"><label for="is_open">Status Type:</label></th>
+        <td>[% IF is_open %]Open[% ELSE %]Closed[% END %]</td>
+      </tr>
+    [% END %]
   </table>
 
   <input type="hidden" name="valueold" value="[% value FILTER html %]">
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index e21e54948..c2bbde28c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -459,6 +459,12 @@
     [% title = "Field Value Not Specified" %]
     No field value specified when trying to edit a field value.
 
+  [% ELSIF error == "fieldvalue_reserved_word" %]
+    [% title = "Reserved Word Not Allowed" %]
+    You cannot use the '[% value FILTER html %]' value for the
+    '[% field.description FILTER html %]' field. This value is used internally.
+    Please choose another one.
+
   [% ELSIF error == "fieldvalue_sortkey_invalid" %]
     [% title = "Invalid Field Value Sortkey" %]
     The sortkey '[% sortkey FILTER html %]' for the '[% name FILTER html %]'
-- 
cgit v1.2.3-24-g4f1b