From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 1 Jun 2011 16:48:47 +0000 (+0200)
Subject: Displays users without profile in alphabetic lists (Closes #1504).
X-Git-Tag: xorg/1.1.2~59
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=93f014c4c02e14c2af92285a0428f99a3dc4e0da;p=platal.git

Displays users without profile in alphabetic lists (Closes #1504).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/ChangeLog b/ChangeLog
index 10f4165..cc04a38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ Bug/Wish:
     * XnetGrp:
         - #947: Lists group former members to group admins                 -JAC
         - #1481: Adds group nl subscription from group profile edition     -JAC
+        - #1504: Displays users without profile in alphabetic lists        -JAC
 
     * XnetEvent:
         - #1487: Removes link to event attending users to group outsiders  -JAC
diff --git a/classes/userfilter/conditions.inc.php b/classes/userfilter/conditions.inc.php
index e931395..ad4dfb2 100644
--- a/classes/userfilter/conditions.inc.php
+++ b/classes/userfilter/conditions.inc.php
@@ -598,8 +598,15 @@ class UFC_NameInitial extends UserFilterCondition
 
     public function buildCondition(PlFilter $uf)
     {
-        $sub = $uf->addDisplayFilter();
-        return 'SUBSTRING(pd.sort_name, 1, 1) ' . XDB::formatWildcards(XDB::WILDCARD_PREFIX, $this->initial);
+        $table = 'sort_name';
+        if ($uf->accountsRequired()) {
+            $table = Profile::getAccountEquivalentName($table);
+            $sub = 'a';
+        } else {
+            $uf->addDisplayFilter();
+            $sub = 'pd';
+        }
+        return 'SUBSTRING(' . $sub . '.' . $table . ', 1, 1) ' . XDB::formatWildcards(XDB::WILDCARD_PREFIX, $this->initial);
     }
 
     public function export()