From d686cc14c0cde5957e804402a4844a5ef08ec5d4 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 24 Apr 2007 21:03:12 +0000 Subject: [PATCH] Fix: la recherche ajax du pays peut se faire sur l'id ou le code --- htdocs/html.form.class.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 2e478f39db8..d3ad76565ea 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -315,9 +315,19 @@ class Form $sql = "SELECT rowid, code, libelle, active"; $sql.= " FROM ".MAIN_DB_PREFIX."c_pays"; $sql.= " WHERE active = 1"; - if ($conf->use_ajax && $selected!='' && $conf->global->CODE_DE_TEST == 1) $sql.= " AND rowid = ".$selected; + if ($conf->use_ajax && $conf->global->CODE_DE_TEST == 1) + { + if (is_numeric($selected)) + { + $sql.= " AND rowid = ".$selected; + } + else + { + $sql.= " AND code = '".$selected."'"; + } + } $sql.= " ORDER BY code ASC;"; - + $resql=$this->db->query($sql); if ($resql) {