X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsearch.php;h=237c739e6c2db530c569ff5fa49ada9a0eabeca6;hb=67b4d856a1d7eca97c12a2350bd6e7ed3ecbccb1;hp=9d7301ac8c972d13e1371e4e08e49ea76895e5bd;hpb=e999a40a812f8a2f350d69c5e1611669ff8937d1;p=platal.git

diff --git a/modules/search.php b/modules/search.php
index 9d7301a..237c739 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -121,10 +121,9 @@ class SearchModule extends PLModule
             require_once 'userset.inc.php';
             $view = new QuickSearchSet();
             $view->addMod('minifiche', 'Mini-fiches', true, array('with_score' => true, 'starts_with' => $byletter));
+            $view->addMod('map', 'Planisphère');
             if (S::logged() && !Env::i('nonins')) {
                 $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true, 'with_score' => true));
-                // TODO: Reactivate when the new map is completed.
-                // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
             }
             $view->apply('search', $page, $model);
 
@@ -150,6 +149,7 @@ class SearchModule extends PLModule
     function handler_advanced($page, $model = null, $byletter = null)
     {
         global $globals;
+        $page->addJsLink('search.js');
         $page->assign('advanced',1);
 
         $networks = DirEnum::getOptions(DirEnum::NETWORKS);
@@ -188,8 +188,7 @@ class SearchModule extends PLModule
             } else {
                 $view->addMod('minifiche', 'Mini-fiches', true, array('starts_with' => $byletter));
                 $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
-                // TODO: Reactivate when the new map is completed.
-                // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
+                $view->addMod('map', 'Planisphère');
                 if (S::user()->checkPerms(User::PERM_EDIT_DIRECTORY) || S::admin()) {
                     $view->addMod('addresses', 'Adresses postales', false);
                 }
@@ -244,17 +243,17 @@ class SearchModule extends PLModule
         }
 
         $enums = array(
-            'binetTxt'           => DirEnum::BINETS,
-            'groupexTxt'         => DirEnum::GROUPESX,
-            'sectionTxt'         => DirEnum::SECTIONS,
-            'networking_typeTxt' => DirEnum::NETWORKS,
-            'localityTxt'        => DirEnum::LOCALITIES,
-            'countryTxt'         => DirEnum::COUNTRIES,
-            'entreprise'         => DirEnum::COMPANIES,
-            'jobtermTxt'         => DirEnum::JOBTERMS,
-            'description'        => DirEnum::JOBDESCRIPTION,
-            'nationaliteTxt'     => DirEnum::NATIONALITIES,
-            'schoolTxt'          => DirEnum::EDUSCHOOLS,
+            'binet_text'           => DirEnum::BINETS,
+            'groupex_text'         => DirEnum::GROUPESX,
+            'section_text'         => DirEnum::SECTIONS,
+            'networking_type_text' => DirEnum::NETWORKS,
+            'locality_text'        => DirEnum::LOCALITIES,
+            'country_text'         => DirEnum::COUNTRIES,
+            'entreprise'           => DirEnum::COMPANIES,
+            'jobterm_text'         => DirEnum::JOBTERMS,
+            'description'          => DirEnum::JOBDESCRIPTION,
+            'nationalite_text'     => DirEnum::NATIONALITIES,
+            'school_text'          => DirEnum::EDUSCHOOLS,
         );
         if (!array_key_exists($type, $enums)) {
             exit();
@@ -313,17 +312,16 @@ class SearchModule extends PLModule
             break;
           case 'administrative_area_level_1':
           case 'administrative_area_level_2':
-          case 'administrative_area_level_3':
           case 'locality':
             $page->assign('onchange', 'changeAddressComponents(\'' . $type . '\', this.value)');
-          case 'sublocality':
+          case 'postal_code':
             $ids = XDB::iterator("SELECT  pace1.id, pace1.long_name AS field
                                     FROM  profile_addresses_components_enum AS pace1
                               INNER JOIN  profile_addresses_components      AS pac1  ON (pac1.component_id = pace1.id)
                               INNER JOIN  profile_addresses_components      AS pac2  ON (pac1.pid = pac2.pid AND pac1.jobid = pac2.jobid AND pac1.id = pac2.id
                                                                                          AND pac1.groupid = pac2.groupid AND pac1.type = pac2.type)
                               INNER JOIN  profile_addresses_components_enum AS pace2 ON (pac2.component_id = pace2.id AND FIND_IN_SET({?}, pace2.types))
-                                   WHERE  pace2.id = {?} AND FIND_IN_SET({?}, pace1.types)
+                                   WHERE  pace2.id = {?} AND FIND_IN_SET({?}, pace1.types) AND pac1.type = 'home'
                                 GROUP BY  pace1.long_name",
                                  Env::v('previous'), Env::v('value'), $type);
             break;