extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

"some more fixes:

Browse Source 
- 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:32:14 +00:00
parent 6aebe8485b
commit 1c72c8e9e0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
preferences/inc/class.uiaclprefs.inc.php
View File

@ -218,7 +218,7 @@ class uiaclprefs
'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;
@ -346,7 +346,6 @@ class uiaclprefs
$this->template->set_var('row_class',$tr_class); $this->template->set_var('row_class',$tr_class);
$this->template->set_var('user',$name); $this->template->set_var('user',$name);
$rights = $this->acl->get_rights($id,$GLOBALS['egw_info']['flags']['currentapp']); $rights = $this->acl->get_rights($id,$GLOBALS['egw_info']['flags']['currentapp']);
$is_group = $GLOBALS['egw']->accounts->get_type($id) == 'g';
foreach(array( foreach(array(
EGW_ACL_READ => 'read', EGW_ACL_READ => 'read',
@ -360,7 +359,7 @@ class uiaclprefs
) 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))