Merge branch 'develop'

This commit is contained in:
Loïc d'Anterroches 2010-12-23 11:32:09 +01:00
commit dbd088458e

View File

@ -317,10 +317,10 @@ class IDF_Views
if ($user->isAnonymous()) { if ($user->isAnonymous()) {
$sql = sprintf('%s=%s', $db->qn('private'), $false); $sql = sprintf('%s=%s', $db->qn('private'), $false);
return Pluf::factory('IDF_Project')->getList(array('filter'=> $sql, return Pluf::factory('IDF_Project')->getList(array('filter'=> $sql,
'order' => 'shortname ASC')); 'order' => 'name ASC'));
} }
if ($user->administrator) { if ($user->administrator) {
return Pluf::factory('IDF_Project')->getList(array('order' => 'shortname ASC')); return Pluf::factory('IDF_Project')->getList(array('order' => 'name ASC'));
} }
// grab the list of projects where the user is admin, member // grab the list of projects where the user is admin, member
// or authorized // or authorized
@ -341,6 +341,6 @@ class IDF_Views
$sql .= sprintf(' OR id IN (%s)', implode(', ', $ids)); $sql .= sprintf(' OR id IN (%s)', implode(', ', $ids));
} }
return Pluf::factory('IDF_Project')->getList(array('filter' => $sql, return Pluf::factory('IDF_Project')->getList(array('filter' => $sql,
'order' => 'shortname ASC')); 'order' => 'name ASC'));
} }
} }