From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Thu, 2 Sep 2010 22:21:51 +0000 (+0200)
Subject: Displays info when autocomplete finds nothing instead of quitting silently autocomplete
X-Git-Tag: xorg/1.0.1~230
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=fb6dc875af9b745c98e4482d5ad0e8cbc1ebfe1d;p=platal.git

Displays info when autocomplete finds nothing instead of quitting silently autocomplete
---

diff --git a/modules/search.php b/modules/search.php
index 2ed9e65..c4f90a6 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -251,6 +251,9 @@ class SearchModule extends PLModule
                 $res .= "\n";
             }
         }
+        if ($nbResults == 0) {
+            $res = $q."|-2\n";
+        }
         XDB::query('REPLACE INTO  search_autocomplete
                           VALUES  ({?}, {?}, {?}, NOW())',
                     $type, $q, $res);
diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 5025531..3809b4d 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -27,20 +27,27 @@
 <script type="text/javascript">// <!--
   var baseurl = platal_baseurl + "search/";
   {literal}
+  String.prototype.htmlEntities = function () {
+    return this.replace(/&/g,'&amp;').replace(new RegExp('<','g'),'&lt;').replace(/>/g,'&gt;');
+  };
   // display an autocomplete row : blabla (nb of found matches)
   function make_format_autocomplete(block) {
     return function(row) {
         regexp = new RegExp('(' + RegExp.escape(block.value) + ')', 'i');
 
-        name = row[0].replace(regexp, '<strong>$1<\/strong>');
+        name = row[0].htmlEntities().replace(regexp, '<strong>$1<\/strong>');
 
         if (row[1] === "-1") {
           return '&hellip;';
         }
 
+        if (row[1] === "-2") {
+          return '<em>aucun camarade trouvé pour '+row[0].htmlEntities()+'<\/em>';
+        }
+
         camarades = (row[1] > 1) ? "camarades" : "camarade";
 
-        return name + '<em>&nbsp;&nbsp;-&nbsp;&nbsp;' + row[1] + '&nbsp;' + camarades + '<\/em>';
+        return name + '<em>&nbsp;&nbsp;-&nbsp;&nbsp;' + row[1].htmlEntities() + '&nbsp;' + camarades + '<\/em>';
       };
   }
 
@@ -93,6 +100,14 @@
     $("input[name='jobterm']").val(jtid);
   }
 
+  function cancel_autocomplete(field, realfield) {
+    $(".autocomplete[name='"+field+"']").removeClass('hidden_valid').val('').focus();
+    if (typeof(realfield) != "undefined") {
+      $(".autocompleteTarget[name='"+realfield+"']").val('');
+    }
+    return;
+  }
+
   // when choosing autocomplete from list, must validate
   function select_autocomplete(name) {
       nameRealField = name.replace(/Txt$/, '');
@@ -104,11 +119,19 @@
       // if changing country, might want to open region choice
       if (nameRealField == 'country')
         return function(i) {
+            if (i.extra[0] < 0) {
+              cancel_autocomplete('countryTxt', 'country');
+              i.extra[1] = '';
+            }
             changeCountry(i.extra[1]);
           }
 
       if (nameRealField == 'school')
         return function(i) {
+            if (i.extra[0] < 0) {
+              cancel_autocomplete('schoolTxt', 'school');
+              i.extra[1] = '';
+            }
             changeSchool(i.extra[1]);
           }
 
@@ -116,6 +139,11 @@
       return function(i) {
         nameRealField = this.field.replace(/Txt$/, '');
 
+        if (i.extra[0] < 0) {
+          cancel_autocomplete(this.field, nameRealField);
+          return;
+        }
+
         $(".autocompleteTarget[name='"+nameRealField+"']").attr('value',i.extra[1]);
 
         $(".autocomplete[name='"+this.field+"']").addClass('hidden_valid');
@@ -189,7 +217,7 @@ function cleanForm(f) {
     } while (old_query != query);
   }
   query = query.replace(/^&*(.*)&*$/, '$1');
-  if (query == "") {
+  if (query == "rechercher=Chercher") {
     alert("Aucun critère n'a été spécifié");
     return false;
   }