diff options
| author | lpsolit%gmail.com <> | 2008-04-05 19:51:42 +0000 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2008-04-05 19:51:42 +0000 |
| commit | a6750cb099ae88ffe3ac7de44ca0e63c87e8542e (patch) | |
| tree | 96736178a20978ee8866a4ff350794f4016c5a4e /template/en/default/flag | |
| parent | 75435a809754c295590426c43b0c4b1aee79d336 (diff) | |
| download | bugs-a6750cb099ae88ffe3ac7de44ca0e63c87e8542e.tar bugs-a6750cb099ae88ffe3ac7de44ca0e63c87e8542e.tar.gz bugs-a6750cb099ae88ffe3ac7de44ca0e63c87e8542e.tar.bz2 bugs-a6750cb099ae88ffe3ac7de44ca0e63c87e8542e.tar.xz bugs-a6750cb099ae88ffe3ac7de44ca0e63c87e8542e.zip | |
Bug 427226: Do not display the requestee field if the flag is not requestable - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=LpSolit (module owner)
Diffstat (limited to 'template/en/default/flag')
| -rw-r--r-- | template/en/default/flag/list.html.tmpl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl index 2b29403c8..462e4063c 100644 --- a/template/en/default/flag/list.html.tmpl +++ b/template/en/default/flag/list.html.tmpl @@ -136,16 +136,23 @@ </td> [% IF any_flags_requesteeble %] <td> - [% IF type.is_active && type.is_requesteeble %] + [% IF (type.is_active && type.is_requestable && type.is_requesteeble) || flag.requestee %] <span style="white-space: nowrap;"> [% IF Param('usemenuforusers') %] + [% flag_custom_list = flag.type.grant_list %] + [% IF !(type.is_active && type.is_requestable && type.is_requesteeble) %] + [%# We are here only because there was already a requestee. In this case, + the only valid action is to remove the requestee or leave it alone; + nothing else. %] + [% flag_custom_list = [flag.requestee] %] + [% END %] [% INCLUDE global/userselect.html.tmpl name => "requestee-$flag.id" id => "requestee-$flag.id" value => flag.requestee.login multiple => 0 emptyok => 1 - custom_userlist => flag.type.grant_list + custom_userlist => flag_custom_list %] [% ELSE %] (<input type="text" size="30" maxlength="255" @@ -189,7 +196,7 @@ </td> [% IF any_flags_requesteeble %] <td> - [% IF type.is_requesteeble %] + [% IF type.is_requestable && type.is_requesteeble %] <span style="white-space: nowrap;"> [% IF Param('usemenuforusers') %] [% INCLUDE global/userselect.html.tmpl @@ -243,7 +250,7 @@ </td> [% IF any_flags_requesteeble %] <td> - [% IF type.is_requesteeble %] + [% IF type.is_requestable && type.is_requesteeble %] <span style="white-space: nowrap;"> [% IF Param('usemenuforusers') %] [% INCLUDE global/userselect.html.tmpl |