X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch%2Fsearch.inc.php;h=7d0bd4c1f3e8a89a5f7f16095efb9daafd760f4a;hb=295d4c48a12e49274135d9f781862a45e5b8c5dc;hp=db8eb70c4aa99db003ad98c9f18f6050f65d9cf6;hpb=137e819f19e50f84f6c44bc42dff2b6b69f14d6a;p=platal.git

diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php
index db8eb70..7d0bd4c 100644
--- a/modules/search/search.inc.php
+++ b/modules/search/search.inc.php
@@ -56,7 +56,9 @@ function advancedSearchFromInput()
 
     $natField        = new RefSField('nationalite',array('u.nationalite'),'','','');
     $binetField      = new RefSField('binet',array('b.binet_id'),'binets_ins','b','u.user_id=b.user_id');
-    $groupexField    = new RefSField('groupex',array('g.gid'),'groupesx_ins','g','u.user_id=g.guid');
+    $groupexField    = new RefSField('groupex',array('g.id'),array('groupex.asso', 'groupex.membres'),array('g', 'gm'),
+                                     array("(g.cat = 'GroupesX' OR g.cat = 'Institutions') AND g.pub = 'public'",
+                                           'gm.asso_id = g.id AND u.user_id=gm.uid'));
     $sectionField    = new RefSField('section',array('u.section'),'','','');
     $schoolField     = new RefSField('school',array('as.aid'),'applis_ins','`as`','u.user_id=as.uid');
     $diplomaField    = new RefSField('diploma',array('ad.type'),'applis_ins','ad','u.user_id=ad.uid');