From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 9 Feb 2010 23:59:31 +0000 (+0100)
Subject: Bug 545253: Do not display flags as editable when you cannot edit attachment attributes
X-Git-Tag: bugzilla-3.6rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=555295cbe02258b34bb2869d1522d1866b934017;p=thirdparty%2Fbugzilla.git

Bug 545253: Do not display flags as editable when you cannot edit attachment attributes
a=LpSolit (module owner)
---

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index d9769cfa3b..fa8a53a4ae 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -160,6 +160,7 @@
             [% PROCESS "flag/list.html.tmpl" bug_id = attachment.bug_id
                                              attach_id = attachment.id
                                              flag_types = attachment.flag_types
+                                             read_only_flags = !can_edit
             %]
           </div>
         [% END %]
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index adf12565c2..c0bffd704d 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -18,7 +18,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% IF user.id %]
+[% IF user.id AND !read_only_flags %]
 
 [%# 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,