From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 10 Apr 2012 22:04:22 +0000 (+0200)
Subject: Allows group animators to edit group's lists' members (Closes #1518).
X-Git-Tag: xorg/1.1.5~15
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=58845f080998affe93f40e3702c22e81987c8c41;p=platal.git

Allows group animators to edit group's lists' members (Closes #1518).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/ChangeLog b/ChangeLog
index 9436373..387dc08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@ Bug/Wish:
         - #1596, #1598: Lists non-X accounts awaiting validation           -JAC
         - #1609: Adds link to account on Xnet account validation           -JAC
 
+    * XnetList:
+        - #1518: Allows group animators to edit group's lists' members     -JAC
+
     * XnetNl:
         - #1606: Fixes Xnet NL deletion                                    -JAC
 
diff --git a/modules/lists.php b/modules/lists.php
index 37c1874..8a5ccb9 100644
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -616,7 +616,17 @@ class ListsModule extends PLModule
         }
 
         $domain = $this->prepare_client($page);
-        $this->verify_list_owner($page, $liste);
+        $force_rights = false;
+        if ($GLOBALS['IS_XNET_SITE']) {
+            $perms = S::v('perms');
+            if (is_object($perms) && $perms->hasFlag('groupadmin')) {
+                $force_rights = true;
+            }
+        }
+        $page->assign('group_admin', $force_rights);
+        if (!$force_rights) {
+            $this->verify_list_owner($page, $liste);
+        }
 
         $page->changeTpl('lists/admin.tpl');
 
diff --git a/templates/lists/admin.tpl b/templates/lists/admin.tpl
index 02c8f06..328a06f 100644
--- a/templates/lists/admin.tpl
+++ b/templates/lists/admin.tpl
@@ -23,7 +23,7 @@
 
 {if !$details.own}
 <p class='erreur'>
-Tu n'es pas administrateur de la liste, mais du site.
+Tu n'es pas administrateur de la liste, mais {if $group_admin}du groupe{else}du site{/if}.
 </p>
 {/if}