Adds search on postcode and thus on arrondissements (Closes #691), updates Changelog.

diff --git a/ChangeLog b/ChangeLog
index 7f27fb5..660d5d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 ================================================================================
 VERSION 0.9.18                                                        XX XX XXXX
 
+Bug/Wish:
+
+    * Search:
+        - #691: Adds search on postcode and thus on "arrondissements"      -JAC
 
 ================================================================================
 VERSION 0.9.17                                                        19 07 2008

diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php
index 0d23a78..985a398 100644 (file)
--- a/modules/search/search.inc.php
+++ b/modules/search/search.inc.php
@@ -48,9 +48,9 @@ function advancedSearchFromInput()
     }
 
     if (!Env::i('cityid')) {
-        $townField      = new RefSField('city',array('ac.city'),'adresses','ac',getadr_join('ac'),false);
+        $townField  = new RefSField('city',array('ac.city', 'ac.postcode'),'adresses','ac',getadr_join('ac'),false);
     } else {
-        $townField    = new RefSField('cityid',array('av.cityid'),'adresses','av',getadr_join('av'));
+        $townField  = new RefSField('cityid',array('av.cityid', 'av.postcode'),'adresses','av',getadr_join('av'));
     }
     $countryField   = new RefSField('country',array('ap.country'),'adresses','ap',getadr_join('ap'));
     $regionField    = new RefSField('region',array('ar.region'),'adresses','ar',getadr_join('ar'));

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 3c6a5ba..ee53cba 100644 (file)
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -288,7 +288,7 @@
       <th colspan="2">Géographie</th>
     </tr>
     <tr>
-      <td>Ville</td>
+      <td>Ville ou code postal</td>
       <td><input type="text" class="autocomplete" name="city" size="32" value="{$smarty.request.city}" /></td>
     </tr>
     <tr>