From f0364fc18e6bdd4190ad8e5a0665a6bc49771a4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Wed, 7 Dec 2011 12:50:26 +0100 Subject: [PATCH] Fixes search form cleaning. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- htdocs/javascript/search.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/javascript/search.js b/htdocs/javascript/search.js index 52870ad..1cfb380 100644 --- a/htdocs/javascript/search.js +++ b/htdocs/javascript/search.js @@ -124,7 +124,10 @@ function display_list(field_name) // }}} // {{{ Regexps to wipe out from search queries -var default_form_values = [ /&woman=0(&|$)/, /&subscriber=0(&|$)/, /&alive=0(&|$)/, /&egal[12]=[^&]*&promo[12]=(&|$)/g, /&networking_type=0(&|$)/, /&[^&=]+=(&|$)/g ]; +var default_form_values = [ /&woman=0(&|$)/, /&subscriber=0(&|$)/, /&alive=0(&|$)/, /&egal2=[^&]*&promo2=(&|$)/, + /&egal1=[^&]*&promo1=&edu_type=(?:Ing[^n]+nieur|Master|Doctorat)(&|$)/, /&networking_type=0(&|$)/, + /&origin_corps=0(&|$)/, /¤t_corps=0(&|$)/, + /corps_rank=0(&|$)/, /&has_email_redirect=0(&|$)/, /&[^&=]+=(&|$)/g ]; /** Uses javascript to clean form from all empty fields */ function cleanForm(f, targeturl) @@ -140,7 +143,8 @@ function cleanForm(f, targeturl) } while (old_query != query); } } - query = query.replace(/^&*(.*)&*$/, '$1'); + query = query.replace(/^(.*)&+$/, '$1'); + query = query.replace(/^&+(.*)$/, '$1'); if (query == 'rechercher=Chercher') { alert("Aucun critère n'a été spécifié."); return false; -- 2.1.4