Merge commit 'origin/master' into fusionax

[platal.git] / modules / search / search.inc.php

diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php
index e988faf..8d2ef8f 100644 (file)
--- a/modules/search/search.inc.php
+++ b/modules/search/search.inc.php
@@ -57,10 +57,11 @@ function advancedSearchFromInput()
     $mapField           = new MapSField('mapid',  array('sgcim.map_id'), array('adresses', 'geoloc_city_in_maps'),
                                         array('amp', 'sgcim'), array(getadr_join('amp'), 'amp.cityid = sgcim.city_id'));
 
-    $entrepriseField    = new RefSField('entreprise', array('ee.entreprise'), 'entreprises', 'ee', 'u.user_id = ee.uid', false);
-    $posteField         = new RefSField('poste', array('ep.poste'), 'entreprises', 'ep', 'u.user_id = ep.uid', false);
-    $fonctionField      = new RefSField('fonction', array('en.fonction'), 'entreprises', 'en', 'u.user_id = en.uid');
-    $secteurField       = new RefSField('secteur', array('fm.secteur'), 'entreprises', 'fm', 'u.user_id = fm.uid');
+    $entrepriseField    = new RefSField('entreprise', array('je.name'), '', '','');
+    $posteField         = new RefSField('poste', array('ep.description'), 'profile_job', 'ep', 'u.user_id = ep.uid', false);
+    $fonctionField      = new RefSField('fonction', array('en.fonction_fr'), 'fonctions_def', 'en',
+                                        'u.user_id = profile_job.uid AND fonctions_def.id = profile_job.functionid');
+    $secteurField       = new RefSField('secteur', array('fm.sectorid'), 'profile_job', 'fm', 'u.user_id = fm.uid');
     $cvField            = new RefSField('cv', array('u.cv'), '', '', '', false);
 
     $natField           = new RefSField('nationalite', array('u.nationalite', 'u.nationalite2', 'u.nationalite3'), '', '', '');