From 3d463f780fd2051751f276f71e27bb47e96dc2aa Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Wed, 2 Sep 2015 14:40:56 +0800
Subject: Bug 1196618 - add support for group owners

---
 .../BMO/template/en/default/pages/group_admins.html.tmpl    | 13 +++++++++++--
 .../BMO/template/en/default/pages/group_members.html.tmpl   |  8 ++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'extensions/BMO/template')

diff --git a/extensions/BMO/template/en/default/pages/group_admins.html.tmpl b/extensions/BMO/template/en/default/pages/group_admins.html.tmpl
index 01bb744c4..c81c95748 100644
--- a/extensions/BMO/template/en/default/pages/group_admins.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/group_admins.html.tmpl
@@ -28,14 +28,23 @@
   <table border="0" cellspacing="0" id="report" class="hover" width="100%">
     <tr id="report-header">
       <th align="left">Name</th>
+      <th align="left">Owner</th>
       <th align="left">Admins</th>
     </tr>
 
     [% FOREACH group = groups %]
       [% count = loop.count() %]
       <tr class="report_item [% count % 2 == 1 ? "report_row_odd" : "report_row_even" %]">
-        <td>
-          [% group.name FILTER html %]
+        <td nowrap>
+          <span title="[% group.description FILTER html %]">
+            [% group.name FILTER html %]</span>
+        </td>
+        <td nowrap>
+          [% IF group.owner.login == 'nobody@mozilla.org' %]
+            &ndash;
+          [% ELSE %]
+            [% INCLUDE global/user.html.tmpl who = group.owner %]
+          [% END %]
         </td>
         <td>
           [% FOREACH admin = group.admins %]
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 98679c1b7..b1f9b82c5 100644
--- a/extensions/BMO/template/en/default/pages/group_members.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/group_members.html.tmpl
@@ -21,7 +21,7 @@
       <select name="group">
         [% FOREACH group_name = groups %]
           <option value="[% group_name FILTER html %]"
-                  [% "selected" IF group_name == group %]>
+                  [% "selected" IF group_name == group.name %]>
             [% group_name FILTER html %]</option>
         [% END %]
       </select>
@@ -39,7 +39,7 @@
 [% IF group != '' %]
 
   <p>
-    [% count FILTER none %] member[% count == 1 ? '' : 's' %] of the <b>[% group FILTER html %]</b> group:
+    [% count FILTER none %] member[% count == 1 ? '' : 's' %] of the <b>[% group.name FILTER html %]</b> group:
   </p>
 
   [% IF types.size > 0 %]
@@ -48,7 +48,7 @@
         <th>Type</th>
         <th>Count</th>
         <th>Members</th>
-        [% IF privileged %]
+        [% IF privileged || (user.id == group.owner.id) %]
           <th class="right">2FA, Last Seen (days ago)</th>
         [% END %]
       </tr>
@@ -111,7 +111,7 @@
       [% END %]
     </table>
 
-    <a href="page.cgi?id=group_members.json&amp;group=[% group FILTER uri %]
+    <a href="page.cgi?id=group_members.json&amp;group=[% group.name FILTER uri %]
        [% IF include_disabled %]&amp;include_disabled=1[% END %]">JSON</a>
   [% ELSE %]
     <p>
-- 
cgit v1.2.3-24-g4f1b