Adapts advance search for the new job interface.

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 65e1a9f..ebd37dd 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -201,7 +201,7 @@ class MinificheView extends MultipageView
 
     public function joins()
     {
-        return  "LEFT JOIN  profile_job                   AS j    ON (j.id = 0 AND j.uid = u.user_id".(S::logged() ? "" : " AND j.pub = 'public'").")
+        return  "LEFT JOIN  profile_job                   AS j    ON (j.uid = u.user_id".(S::logged() ? "" : " AND j.pub = 'public'").")
                  LEFT JOIN  profile_job_enum              AS je   ON (je.id = j.jobid)
                  LEFT JOIN  profile_job_sector_enum       AS es   ON (j.sectorid = es.id)
                  LEFT JOIN  fonctions_def                 AS ef   ON (j.functionid = ef.id)

diff --git a/modules/search/classes.inc.php b/modules/search/classes.inc.php
index 6d81622..7ad0e8c 100644 (file)
--- a/modules/search/classes.inc.php
+++ b/modules/search/classes.inc.php
@@ -56,7 +56,7 @@ else
         IF(adr.pub='public', adr.city, '')   AS city,
         IF(adr.pub='public', gp.pays, '')    AS countrytxt,
         IF(adr.pub='public', gr.name, '')    AS region,
-        IF(e.pub='public', ee.name, '')      AS entreprise,
+        IF(e.pub='public', je.name, '')      AS entreprise,
         IF(nw.pub='public', nw.address, '')  AS networking_address,
         IF(nw.pub='public', nwe.name, '')    AS networking_name,";
 @$globals->search->result_where_statement = '

diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php
index 9c4a8a2..8d2ef8f 100644 (file)
--- a/modules/search/search.inc.php
+++ b/modules/search/search.inc.php
@@ -57,8 +57,7 @@ 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.name'), 'profile_job_enum', 'ee',
-                                        'u.user_id = profile_job.uid AND profile_job.jobid = profile_job_enum.id', false);
+    $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');