From 407c91173e6aaafceceffaa15008e4f2c8f02783 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Wed, 7 Dec 2011 12:59:44 +0100 Subject: [PATCH] Removes remaining results count from queries (Closes #1572). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- ChangeLog | 1 + htdocs/javascript/search.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index d7d6184..12158fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ VERSION 1.1.5 XX XX XXXX Bug/Wish: * Search: + - #1572: Removes remaining results count from queries -JAC - #1574: Correctly displays State corps -GLN * Validations: diff --git a/htdocs/javascript/search.js b/htdocs/javascript/search.js index 1cfb380..989aee7 100644 --- a/htdocs/javascript/search.js +++ b/htdocs/javascript/search.js @@ -145,6 +145,9 @@ function cleanForm(f, targeturl) } query = query.replace(/^(.*)&+$/, '$1'); query = query.replace(/^&+(.*)$/, '$1'); + + // Removes "(n camarades)" if any of them are remaining. + query = query.replace(/\+\(\d+\+camarade(?:s)?\)/, ''); if (query == 'rechercher=Chercher') { alert("Aucun critère n'a été spécifié."); return false; -- 2.1.4