"some more fixes:

- fixed not grayed out checkbox for grants to user set via group-acl
- fixed wrong soriting off accounts by account_lid instead of full name, which is displayed"
This commit is contained in:
Ralf Becker 2010-04-20 11:35:32 +00:00
parent e07d734ca8
commit 3f25e174d9

View File

@ -202,7 +202,7 @@
'start' => $start, 'start' => $start,
'query' => $query, 'query' => $query,
'query_type' => $search_type, //KL 20061204 added to have query_type available 'query_type' => $search_type, //KL 20061204 added to have query_type available
'order' => 'account_type,account_lid', 'order' => 'account_type,account_fullname',
'sort' => 'ASC', 'sort' => 'ASC',
)); ));
$totalentries = $GLOBALS['egw']->accounts->total; $totalentries = $GLOBALS['egw']->accounts->total;
@ -324,7 +324,7 @@
) as $right => $name) ) as $right => $name)
{ {
$is_group_set = False; $is_group_set = False;
if ($is_group) if ($memberships)
{ {
$grantors = $this->acl->get_ids_for_location($id,$right,$GLOBALS['egw_info']['flags']['currentapp']); $grantors = $this->acl->get_ids_for_location($id,$right,$GLOBALS['egw_info']['flags']['currentapp']);
if (is_array($grantors)) if (is_array($grantors))