Bug 779600: Hide flag types you cannot request nor set instead of leaving them as...

r=dkl a=LpSolit

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 75c10c075d6c23d884e6ba7873d4c47ee3cf43c6..9eb6b44413fda9b53d1393e01445bb2a1aa44ebd 100644 (file)
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -91,6 +91,7 @@
 [%# Display a table row for flags %]
 
 [% BLOCK flag_row %]
+  [% RETURN IF !flag && !((type.is_requestable && user.can_request_flag(type)) || user.can_set_flag(type)) %]
   [% SET fid = flag ? "flag-$flag.id" : "flag_type-$type.id" %]
   <tbody[% ' class="bz_flag_type"' IF !flag %]>
     <tr>
@@ -107,9 +108,6 @@
       </td>
       <td>
         <select id="[% fid FILTER html %]" name="[% fid FILTER html %]"
-                [% IF !flag && !((type.is_requestable && user.can_request_flag(type)) || user.can_set_flag(type)) %]
-                  disabled="disabled"
-                [% END %]
                 title="[% type.description FILTER html %]"
                 onchange="toggleRequesteeField(this);"
                 class="flag_select flag_type-[% type.id %]">