From c2364b357634e07c1b709c5cb120181ae3bc5e65 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Mon, 12 Oct 2015 12:53:40 +0800 Subject: Bug 1150358 - cannot remove other people from the cc list --- .../template/en/default/bug_modal/cc_list.html.tmpl | 18 +++++++++++++++--- .../template/en/default/bug_modal/edit.html.tmpl | 1 + .../template/en/default/bug_modal/user.html.tmpl | 3 ++- 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'extensions/BugModal/template/en/default') diff --git a/extensions/BugModal/template/en/default/bug_modal/cc_list.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/cc_list.html.tmpl index 37f582e0e..ceb6e3b62 100644 --- a/extensions/BugModal/template/en/default/bug_modal/cc_list.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/cc_list.html.tmpl @@ -9,8 +9,20 @@ [% UNLESS cc_list.size; 'None'; - END; - FOREACH cc IN cc_list; - INCLUDE bug_modal/user.html.tmpl u=cc; + RETURN; END; %] + +[% FOREACH cc IN cc_list %] +
+ [% IF bug.user.canedit %] + + [% END %] + [% INCLUDE bug_modal/user.html.tmpl + u = cc + id = "ccu-" _ loop.count + %] +
+[% END %] diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index 5d148a7dd..ddf37a26c 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -617,6 +617,7 @@ [% END %] [% IF bug.cc && bug.cc.size %] + [% diff --git a/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl index 062276614..4c28936cc 100644 --- a/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl @@ -12,6 +12,7 @@ # gravatar_size : size of the gravator icon (default 0, which disables the gravatar) # gravatar_only : boolean, if true output just the gravatar (not-simple only) # nick_only : boolean, if true, the nickname will be used instead of the full name + # id : string, if provided the id of the vcard div #%] [% @@ -24,7 +25,7 @@ IF user.settings.show_gravatars.value != 'On'; gravatar_size = 0; END; %] -
+
[% FILTER collapse %] [% IF simple %] -- cgit v1.2.3-24-g4f1b