Bug 477662: Display attachment flags as read-only to logged out users - Patch by...

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 527766357a436254f13b30343c8f8616bd7c1944..5d8a423f8e80b9ae7ecac3e3c97b444c8ad3abe3 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -1,4 +1,4 @@
-[%# The contents of this file are subject to the Mozilla Public
+[%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
   # the License at http://www.mozilla.org/MPL/
@@ -938,23 +938,11 @@
     </tr>
     <tr>
       <td colspan="2">
-      [% IF user.id %]
         [% IF bug.flag_types.size > 0 %]
           [% PROCESS "flag/list.html.tmpl" flag_no_header = 1
                                            flag_types = bug.flag_types
                                            any_flags_requesteeble = bug.any_flags_requesteeble %]
         [% END %]
-      [% ELSE %]
-        [% FOREACH type = bug.flag_types %]
-          [% FOREACH flag = type.flags %]
-              [% flag.setter.nick FILTER html %]:
-              [%+ type.name FILTER html FILTER no_break %][% flag.status %]
-              [%+ IF flag.requestee %]
-                ([% flag.requestee.nick FILTER html %])
-              [% END %]<br>
-          [% END %]
-        [% END %]
-      [% END %]         
       </td>
     </tr>
   [% END %]

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 32a44a605d93125c6521e48dd1fc60afbc4a2175..c7c8822f3534622ebb354f95b16d12e4e735aab1 100644 (file)
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -72,6 +72,8 @@
 // -->
 </script>
 
+[% IF user.id %]
+
 [%# We list flags by looping twice over the flag types relevant for the bug.
   # In the first loop, we display existing flags and then, for active types,
   # we display UI for adding new flags.  In the second loop, we display UI 
@@ -273,3 +275,16 @@
   [% END %]
 
 </table>
+
+[% ELSE %]
+  [%# The user is logged out. Display flags as read-only. %]
+  [% FOREACH type = flag_types %]
+    [% FOREACH flag = type.flags %]
+      [% flag.setter.nick FILTER html %]:
+      [%+ type.name FILTER html FILTER no_break %][% flag.status %]
+      [% IF flag.requestee %]
+        ([% flag.requestee.nick FILTER html %])
+      [% END %]<br>
+    [% END %]
+  [% END %]
+[% END %]
\ No newline at end of file