summaryrefslogtreecommitdiffstats
path: root/extensions/BMO/template
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-08-24 19:44:36 +0200
committerByron Jones <glob@mozilla.com>2015-08-24 19:44:36 +0200
commitc63ecc86155c5bb6fb85e6412fe7c6e80ba33a65 (patch)
tree8ad223b0d9b3006c3ba454a74ea3cc6500989b21 /extensions/BMO/template
parent24e4c03268aa627947f73703f4c283b9b8087d5e (diff)
downloadbugzilla-c63ecc86155c5bb6fb85e6412fe7c6e80ba33a65.tar.gz
bugzilla-c63ecc86155c5bb6fb85e6412fe7c6e80ba33a65.tar.xz
Bug 1197696 - group_members report doesn't display nested inherited groups
Diffstat (limited to 'extensions/BMO/template')
-rw-r--r--extensions/BMO/template/en/default/pages/group_members.html.tmpl14
-rw-r--r--extensions/BMO/template/en/default/pages/group_members.json.tmpl29
2 files changed, 10 insertions, 33 deletions
diff --git a/extensions/BMO/template/en/default/pages/group_members.html.tmpl b/extensions/BMO/template/en/default/pages/group_members.html.tmpl
index 67db8ea2e..bd27b8be2 100644
--- a/extensions/BMO/template/en/default/pages/group_members.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/group_members.html.tmpl
@@ -41,7 +41,7 @@
[% IF group != '' %]
<p>
- Members of the <b>[% group FILTER html %]</b> group:
+ [% count FILTER none %] member[% count == 1 ? '' : 's' %] of the <b>[% group FILTER html %]</b> group:
</p>
[% IF types.size > 0 %]
@@ -58,14 +58,18 @@
[% FOREACH type = types %]
[% count = loop.count() %]
<tr class="report_item [% count % 2 == 1 ? "report_row_odd" : "report_row_even" %]">
- <td valign="top">
+ <td valign="top" nowrap>
[% IF type.name == 'direct' %]
direct
[% ELSE %]
- via&nbsp;
+ via
[% IF privileged %]
- [% type.name FILTER html %]
- [% ELSE %]another&nbsp;group[% END %]
+ <a href="page.cgi?id=group_members.html&group=[% type.name FILTER uri %]">
+ [% type.name FILTER html %]
+ </a>
+ [% ELSE %]
+ another group
+ [% END %]
[% END %]
</td>
<td valign="top" align="right">
diff --git a/extensions/BMO/template/en/default/pages/group_members.json.tmpl b/extensions/BMO/template/en/default/pages/group_members.json.tmpl
index e982731f7..30b969e2f 100644
--- a/extensions/BMO/template/en/default/pages/group_members.json.tmpl
+++ b/extensions/BMO/template/en/default/pages/group_members.json.tmpl
@@ -6,31 +6,4 @@
# defined by the Mozilla Public License, v. 2.0.
#%]
-[
- [% SET count = 0 %]
- [% FOREACH type = types %]
- [% SET count = count + type.members.size %]
- [% END %]
- [% SET i = 0 %]
- [% FOREACH type = types %]
- [% FOREACH member = type.members %]
- [% SET i = i + 1 %]
- { "login": "[% member.login FILTER email FILTER js %]",
- [% IF type.name == "direct" %]
- "membership": "direct",
- [% ELSE %]
- "membership": "indirect",
- [% IF user.in_group('editusers') || user.in_group('infrasec') %]
- "group": "[% type.name FILTER js %]",
- [% END %]
- [% END %]
- [% IF include_disabled %]
- "disabled": "[% member.is_enabled ? "false" : "true" %]",
- [% END %]
- [% IF user.in_group('editusers') || user.in_group('infrasec') %]
- "lastseen": "[% member.lastseen FILTER js %]"
- [% END %]
- }[% "," UNLESS i == count %]
- [% END %]
- [% END %]
-]
+[% types_json FILTER none %]