From: lpsolit%gmail.com <>
Date: Sat, 5 Apr 2008 19:53:21 +0000 (+0000)
Subject: Bug 427226: Do not display the requestee field if the flag is not requestable - Patch... 
X-Git-Tag: bugzilla-3.0.4~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0872dbb618aa527442d4a5ab32c7fdc2023a43e5;p=thirdparty%2Fbugzilla.git

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)
---

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 61ecf2dfaf..0cba5232b7 100644
--- 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 %]"