Close #481: Clicking on a city or on the "Lister les X presents sur cette

carte" now work on xnet.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/ChangeLog b/ChangeLog
index 58aafda..f31f9c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ Bug/Wish:
         - #694: Color of 'Promotion' groups                                -ALK
 
     * XnetGrp:
+        - #481: Can list user of a city or a map from the geoloc           -FRU
         - #658: Admins can convert 'non-X' into X                          -FRU
         - #696: Don't forget non-X when counting members                   -FRU
         - #698: Fix the unregister user lister when adding a new member    -FRU

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 96fccc2..acaf70e 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -328,10 +328,13 @@ class XnetGrpModule extends PLModule
     {
         global $globals;
 
-        if ($action == 'geoloc' || $action == 'trombi') {
+        if ($action == 'search') {
+            http_redirect("https://www.polytechnique.org/search/adv?rechercher=Chercher&groupex={$globals->asso('id')}"
+                        . "&cityid=" . Env::v('cityid') . "&mapid=" . Env::v('mapid'));
+        } else if ($action == 'geoloc' || $action == 'trombi') {
             $view = new UserSet();
             $view->addMod('trombi', 'Trombinoscope');
-            $view->addMod('geoloc', 'Planisphère');
+            $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'annuaire/search'));
             $view->apply('annuaire', $page, $action, $subaction);
             if ($action == 'geoloc' && $subaction) {
                 return;