summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2009-02-09 22:06:32 +0100
committerlpsolit%gmail.com <>2009-02-09 22:06:32 +0100
commit3f11fbd985b6870ce835fa2a8570a6bb2961eb27 (patch)
tree1da7ab882127b024a57a5d3b48ec963858f57360
parentc23619f179ccb6c3dfdfdf3991a16ca8e2d5bf31 (diff)
downloadbugzilla-3f11fbd985b6870ce835fa2a8570a6bb2961eb27.tar.gz
bugzilla-3f11fbd985b6870ce835fa2a8570a6bb2961eb27.tar.xz
Bug 477662: Display attachment flags as read-only to logged out users - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
-rw-r--r--template/en/default/bug/edit.html.tmpl14
-rw-r--r--template/en/default/flag/list.html.tmpl15
2 files changed, 16 insertions, 13 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 527766357..5d8a423f8 100644
--- 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 32a44a605..c7c8822f3 100644
--- 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