diff options
| author | reed%reedloden.com <> | 2006-12-19 13:01:32 +0100 |
|---|---|---|
| committer | reed%reedloden.com <> | 2006-12-19 13:01:32 +0100 |
| commit | 04843101a25b34f2d7aee8863051cba7e3f3049c (patch) | |
| tree | 4ccc76d32838ceb0bab973dfbdfc4aaef608c59c /template/en/default/flag | |
| parent | 1ffa6b322affcbe9fa842b55c29b06689fe7edd0 (diff) | |
| download | bugzilla-04843101a25b34f2d7aee8863051cba7e3f3049c.tar.gz bugzilla-04843101a25b34f2d7aee8863051cba7e3f3049c.tar.xz | |
Bug 335389 - "flags should use '', '?', '+', '-' as option order" [p=reed r=LpSolit a=myk]
Diffstat (limited to 'template/en/default/flag')
| -rw-r--r-- | template/en/default/flag/list.html.tmpl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl index 42bdb9d0b..9f89faacb 100644 --- a/template/en/default/flag/list.html.tmpl +++ b/template/en/default/flag/list.html.tmpl @@ -111,15 +111,15 @@ [% IF user.can_request_flag(type) %] <option value="X"></option> [% END %] + [% IF (type.is_requestable && user.can_request_flag(type)) || flag.status == "?" %] + <option value="?" [% "selected" IF flag.status == "?" %]>?</option> + [% END %] [% IF user.can_set_flag(type) || flag.status == "+" %] <option value="+" [% "selected" IF flag.status == "+" %]>+</option> [% END %] [% IF user.can_set_flag(type) || flag.status == "-" %] <option value="-" [% "selected" IF flag.status == "-" %]>-</option> [% END %] - [% IF (type.is_requestable && user.can_request_flag(type)) || flag.status == "?" %] - <option value="?" [% "selected" IF flag.status == "?" %]>?</option> - [% END %] [% ELSE %] <option value="[% flag.status %]" selected="selected">[% flag.status %]</option> [% END %] @@ -158,13 +158,13 @@ [% " disabled=\"disabled\"" UNLESS user.can_request_flag(type) %] onchange="toggleRequesteeField(this);"> <option value="X"></option> + [% IF type.is_requestable && user.can_request_flag(type) %] + <option value="?">?</option> + [% END %] [% IF user.can_set_flag(type) %] <option value="+">+</option> <option value="-">-</option> [% END %] - [% IF type.is_requestable && user.can_request_flag(type) %] - <option value="?">?</option> - [% END %] </select> </td> [% IF any_flags_requesteeble %] @@ -184,7 +184,7 @@ [%# Step 2: Display flag type again (if type is multiplicable). %] [% FOREACH type = flag_types %] - [% NEXT UNLESS type.flags && type.flags.size > 0 && type.is_multiplicable && type.is_active %] + [% NEXT UNLESS type.is_multiplicable && type.is_active %] [% IF !separator_displayed %] <tr><td colspan="3"><hr></td></tr> [% separator_displayed = 1 %] @@ -201,13 +201,13 @@ [% " disabled=\"disabled\"" UNLESS user.can_request_flag(type) %] onchange="toggleRequesteeField(this);"> <option value="X"></option> + [% IF type.is_requestable && user.can_request_flag(type) %] + <option value="?">?</option> + [% END %] [% IF user.can_set_flag(type) %] <option value="+">+</option> <option value="-">-</option> [% END %] - [% IF type.is_requestable && user.can_request_flag(type) %] - <option value="?">?</option> - [% END %] </select> </td> [% IF any_flags_requesteeble %] |