Bug 427226: Do not display the requestee field if the flag is not requestable - Patch...

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 61ecf2dfafba7e461164b14bef1dafc755c7ba9e..0cba5232b7dc1e86ddc5c24ce961a43b13ec7ed8 100644 (file)
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -128,7 +128,7 @@
         </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;">
                 (<input type="text" size="30" maxlength="255"
                         id="requestee-[% flag.id %]" 
@@ -171,7 +171,7 @@
         </td>
         [% IF any_flags_requesteeble %]
           <td>
-            [% IF type.is_requesteeble %]
+            [% IF type.is_requestable && type.is_requesteeble %]
               <span style="white-space: nowrap;">
                 (<input type="text" size="30" maxlength="255"
                         id="requestee_type-[% type.id %]" 
@@ -215,7 +215,7 @@
       </td>
       [% IF any_flags_requesteeble %]
         <td>
-          [% IF type.is_requesteeble %]
+          [% IF type.is_requestable && type.is_requesteeble %]
               <span style="white-space: nowrap;">
                 (<input type="text" size="30" maxlength="255"
                         id="requestee_type-[% type.id %]"