From 8816b8cb98a7902b722c00cbed6e22b12f176e74 Mon Sep 17 00:00:00 2001
From: "myk%mozilla.org" <>
Date: Sat, 9 Nov 2002 09:58:47 +0000
Subject: Fix for bug 171505: shows disabled flags in the UI r=bbaetz
 a=justdave

---
 template/en/default/attachment/list.html.tmpl |  9 +++------
 template/en/default/flag/list.html.tmpl       | 10 +++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'template')

diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 59f749695..265803602 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -19,16 +19,13 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[%# Whether or not to include flags. %]
-[% display_flags = num_attachment_flag_types > 0 %]
-
 <br>
 <table cellspacing="0" cellpadding="4" border="1">
   <tr>
     <th bgcolor="#cccccc" align="left">Attachment</th>
     <th bgcolor="#cccccc" align="left">Type</th>
     <th bgcolor="#cccccc" align="left">Created</th>
-    [% IF display_flags %]
+    [% IF show_attachment_flags %]
       <th bgcolor="#cccccc" align="left">Flags</th>
     [% END %]
     <th bgcolor="#cccccc" align="left">Actions</th>
@@ -55,7 +52,7 @@
 
       <td valign="top">[% attachment.date %]</td>
 
-      [% IF display_flags %]
+      [% IF show_attachment_flags %]
         <td valign="top">
           [% IF attachment.flags.size == 0 %]
             <i>none</i>
@@ -85,7 +82,7 @@
   [% END %]
 
   <tr>
-    <td colspan="[% display_flags ? 4 : 3 %]">
+    <td colspan="[% show_attachment_flags ? 4 : 3 %]">
       <a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.)
     </td>
     <td colspan="1">
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index f809a4e0e..abfac6fcc 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -33,9 +33,13 @@
         <td>
           <select name="flag-[% flag.id %]">
             <option value="X"></option>
-            <option value="+" [% "selected" IF flag.status == "+" %]>+</option>
-            <option value="-" [% "selected" IF flag.status == "-" %]>-</option>
-            <option value="?" [% "selected" IF flag.status == "?" %]>?</option>
+            [% IF flag.is_active %]
+              <option value="+" [% "selected" IF flag.status == "+" %]>+</option>
+              <option value="-" [% "selected" IF flag.status == "-" %]>-</option>
+              <option value="?" [% "selected" IF flag.status == "?" %]>?</option>
+            [% ELSE %]
+              <option value="[% flag.status %]" selected>[% flag.status %]</option>
+            [% END %]
           </select>
         </td>
         <td>
-- 
cgit v1.2.3-24-g4f1b