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 d9769cfa3b122d6d0ac7b230e7a6673e6a6b1f9a..fa8a53a4ae1baf603aa8145f8e075ffbf27d55cd 100644 (file)
--- 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 adf12565c235c8c695cadf63691343f756992627..c0bffd704d72f16a417ded866955e99f44ab78b3 100644 (file)
--- 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,