From d0ed29ed4fda618c669ddd9cd83465c74e89e1fb Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" Date: Wed, 10 Feb 2010 00:03:50 +0000 Subject: [PATCH] Bug 545253: Do not display flags as editable when you cannot edit attachment attributes a=LpSolit (module owner) git-svn-id: svn://10.0.0.236/trunk@259657 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- .../bugzilla/template/en/default/attachment/edit.html.tmpl | 1 + .../webtools/bugzilla/template/en/default/flag/list.html.tmpl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index e695a028aaa..da9f0d05a6f 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -6974 \ No newline at end of file +6975 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl index d9769cfa3b1..fa8a53a4ae1 100644 --- a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl +++ b/mozilla/webtools/bugzilla/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 %] [% END %] diff --git a/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl index adf12565c23..c0bffd704d7 100644 --- a/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl @@ -18,7 +18,7 @@ # Contributor(s): Myk Melez #%] -[% 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,