diff options
| author | Byron Jones <glob@mozilla.com> | 2015-10-12 06:53:40 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-10-12 06:53:40 +0200 |
| commit | c2364b357634e07c1b709c5cb120181ae3bc5e65 (patch) | |
| tree | c47823a345d76a4112522905c8ce03bfa804f1e2 /extensions/BugModal/template | |
| parent | 0c703a9d3b3ede6728b0fff7a979f48ce22adbb9 (diff) | |
| download | bugzilla-c2364b357634e07c1b709c5cb120181ae3bc5e65.tar.gz bugzilla-c2364b357634e07c1b709c5cb120181ae3bc5e65.tar.xz | |
Bug 1150358 - cannot remove other people from the cc list
Diffstat (limited to 'extensions/BugModal/template')
3 files changed, 18 insertions, 4 deletions
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 %] + <div class="cc-user" data-n="[% loop.count FILTER none %]"> + [% IF bug.user.canedit %] + <a href="#" id="ccr-[% loop.count FILTER none %]" class="cc-remove" + data-n="[% loop.count FILTER none %]" data-login="[% cc.login FILTER html %]" + title="Remove" style="visibility:hidden"> ✖ </a> + [% END %] + [% INCLUDE bug_modal/user.html.tmpl + u = cc + id = "ccu-" _ loop.count + %] + </div> +[% 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 %] + <input type="hidden" name="removecc" id="removecc"> <span id="cc-latch">▸</span> <span id="cc-summary"> [% 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; %] -<div class="vcard vcard_[% u.id FILTER none %]"> +<div class="vcard vcard_[% u.id FILTER none %]" [% IF id %]id="[% id FILTER html %]"[% END %]> [% FILTER collapse %] [% IF simple %] |