From: x2000bedo Date: Tue, 12 Oct 2004 21:51:58 +0000 (+0000) Subject: Closes FS#92 X-Git-Tag: xorg/old~1306 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=61d7f5b12e36b6afb64c19ad39f450fbe8837a40;p=platal.git Closes FS#92 --- diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php index d126fac..66ef7db 100644 --- a/htdocs/advanced_search.php +++ b/htdocs/advanced_search.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: advanced_search.php,v 1.12 2004-10-12 21:22:44 x2000bedo Exp $ + $Id: advanced_search.php,v 1.13 2004-10-12 21:51:58 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -105,7 +105,7 @@ else { $where = $fields->get_where_statement(); $sql = 'SELECT SQL_CALC_FOUND_ROWS - u.matricule,i.matricule_ax, + DISTINCT u.matricule,i.matricule_ax, 1 AS inscrit, u.nom, u.epouse, diff --git a/htdocs/search.php b/htdocs/search.php index 5003953..dc1f526 100644 --- a/htdocs/search.php +++ b/htdocs/search.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: search.php,v 1.23 2004-10-12 21:22:44 x2000bedo Exp $ + $Id: search.php,v 1.24 2004-10-12 21:51:58 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -61,7 +61,7 @@ if (array_key_exists('rechercher', $_REQUEST)) { $offset = new NumericSField('offset'); $sql = 'SELECT SQL_CALC_FOUND_ROWS - r.matricule,i.matricule_ax, + DISTINCT r.matricule,i.matricule_ax, u.nom!="" AS inscrit, u.*, UPPER(IF(u.nom!="",u.nom,i.nom)) AS nom,