diff options
| author | myk%mozilla.org <> | 2002-11-09 10:58:47 +0100 |
|---|---|---|
| committer | myk%mozilla.org <> | 2002-11-09 10:58:47 +0100 |
| commit | 8816b8cb98a7902b722c00cbed6e22b12f176e74 (patch) | |
| tree | b8548c08fa5472df8b22943bd4deda444863f56d /template/en/default | |
| parent | c39803cc45e621f01e0598c7fb875f5e494ebd14 (diff) | |
| download | bugzilla-8816b8cb98a7902b722c00cbed6e22b12f176e74.tar.gz bugzilla-8816b8cb98a7902b722c00cbed6e22b12f176e74.tar.xz | |
Fix for bug 171505: shows disabled flags in the UI
r=bbaetz
a=justdave
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/attachment/list.html.tmpl | 9 | ||||
| -rw-r--r-- | template/en/default/flag/list.html.tmpl | 10 |
2 files changed, 10 insertions, 9 deletions
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 %]&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> |