From: x2000bedo Date: Sat, 27 Nov 2004 15:41:00 +0000 (+0000) Subject: Closes FS #56 X-Git-Tag: xorg/old~774 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c6472cdd62e295513f9295ce22e1897a01ef5739;p=platal.git Closes FS #56 Referent in advanced search only (quick search is not concerned) --- diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php index 56f2658..869ffa3 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.34 2004-11-27 12:01:54 x2000bedo Exp $ + $Id: advanced_search.php,v 1.35 2004-11-27 15:41:00 x2000bedo Exp $ ***************************************************************************/ require_once("xorg.inc.php"); @@ -120,9 +120,10 @@ else { '.$globals->search_result_fields.' c.uid AS contact, w.ni_id AS contact - FROM auth_user_md5 AS u - '.$fields->get_select_statement().' - LEFT JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie") + FROM auth_user_md5 AS u' + .$fields->get_select_statement() + .((!empty($_REQUEST['only_referent']))?' INNER JOIN mentor AS m ON (m.uid = u.user_id)':'') + .' LEFT JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie") LEFT JOIN contacts AS c ON (c.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).' AND c.contact=u.user_id) LEFT JOIN watch_nonins AS w ON (w.ni_id=u.user_id AND w.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).') '.$globals->search_result_where_statement.' diff --git a/templates/search.adv.form.tpl b/templates/search.adv.form.tpl index bdb9955..91793b0 100644 --- a/templates/search.adv.form.tpl +++ b/templates/search.adv.form.tpl @@ -17,7 +17,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: search.adv.form.tpl,v 1.2 2004-11-27 12:01:57 x2000bedo Exp $ + $Id: search.adv.form.tpl,v 1.3 2004-11-27 15:41:03 x2000bedo Exp $ ***************************************************************************}

Recherche avancée

@@ -119,6 +119,12 @@ Activité + + + chercher uniquement parmis les camarades se proposant comme référent + + + Entreprise