From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 3 Oct 2010 10:36:58 +0000 (+0200)
Subject: When displaying members of a lists, sort by category, not by promotion.
X-Git-Tag: xorg/1.0.1~114
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8cf97f9717c61dcd3c5c34eb823ea658a4d5878c;p=platal.git

When displaying members of a lists, sort by category, not by promotion.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 217745a..0a8e0d2 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -30,15 +30,15 @@ function list_sort_owners(&$members, $tri_promo = true)
     foreach($members as $mem) {
         $user = User::getSilent($mem);
         if (!$user) {
-            $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnue' : null), 'n' => null, 'x' => null, 'b' => null);
+            $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnus' : null), 'n' => null, 'x' => null, 'b' => null);
         } else {
             $uid = $user->id();
             $nom = $user->directoryName();
-            $promo = $user->promo();
+            $promo = $user->category();
             if (!$promo) {
-                $promo = 'non-X';
+                $promo = 'extérieurs';
             }
-            $key = $tri_promo ? ($promo != 'non-X' ? $promo : 0) : strtoupper(@$nom{0});
+            $key = $tri_promo ? ($promo != 'extérieurs' ? $promo : 0) : strtoupper(@$nom{0});
             if ($tri_promo) {
                 $promo = null;
             }