From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Sun, 5 Nov 2006 13:40:03 +0000 (+0000)
Subject: Complete and fix [1049]
X-Git-Tag: xorg/0.9.12~142
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f6bdd218d85efeb47afd95fe82b0d21a9dee3c1a;p=platal.git

Complete and fix [1049]


git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1052 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index 76f4598..5a4de5e 100644
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -61,7 +61,7 @@ function get_event_detail($eid, $item_id = false)
              LEFT JOIN groupex.evenements_participants AS ep
                        ON (e.eid = ep.eid AND ei.item_id = ep.item_id)
                  WHERE e.eid = {?}
-              GROUP BY ep.uid", $eid);
+              GROUP BY ep.uid", $evt['eid']);
         $evt['nb_tot'] = array_sum($res->fetchColumn());
         $evt['titre'] = '';
         $evt['item_id'] = 0;
diff --git a/templates/xnetevents/admin.tpl b/templates/xnetevents/admin.tpl
index 718a7dd..4018581 100644
--- a/templates/xnetevents/admin.tpl
+++ b/templates/xnetevents/admin.tpl
@@ -37,9 +37,9 @@ L'
 
 {if count($moments) > 1}
 <p class="center">
-[<a href="{$platal->ns}events/admin/{$evt.eid}"{if !$platal->argv[2]}class="erreur"{/if}>tout</a>]
+[<a href="{$platal->ns}events/admin/{$evt.short_name|default:$evt.eid}"{if !$platal->argv[2]}class="erreur"{/if}>tout</a>]
 {foreach from=$moments item=m}
-[<a href="{$platal->ns}events/admin/{$evt.eid}/{$m.item_id}" {if $platal->argv[2] eq $m.item_id}class="erreur"{/if}>{$m.titre}</a>]
+[<a href="{$platal->ns}events/admin/{$evt.short_name|default:$evt.eid}/{$m.item_id}" {if $platal->argv[2] eq $m.item_id}class="erreur"{/if}>{$m.titre}</a>]
 {/foreach}
 </p>
 {/if}