forked from extern/egroupware
Fix owner selection:
- Make user's categories readonly in admin - Fix display of group categories in preferences
This commit is contained in:
parent
fe7e8ef9ac
commit
80c4d0d5c6
@ -221,7 +221,7 @@ class admin_categories
|
|||||||
{
|
{
|
||||||
$sel_options['owner'][0] = lang('All users');
|
$sel_options['owner'][0] = lang('All users');
|
||||||
}
|
}
|
||||||
if($this->appname == 'admin')
|
if($this->appname == 'admin' || ($content['id'] && !((int)$content['owner'] > 0)))
|
||||||
{
|
{
|
||||||
$sel_options['owner'][0] = lang('All users');
|
$sel_options['owner'][0] = lang('All users');
|
||||||
$accs = $GLOBALS['egw']->accounts->get_list('groups');
|
$accs = $GLOBALS['egw']->accounts->get_list('groups');
|
||||||
@ -233,7 +233,11 @@ class admin_categories
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$content['no_private'] = true;
|
$content['no_private'] = true;
|
||||||
|
}
|
||||||
|
if($this->appname == 'admin')
|
||||||
|
{
|
||||||
$content['access'] = 'public';
|
$content['access'] = 'public';
|
||||||
|
$readonlys['owner'] = $content['owner'] > 0;
|
||||||
} else {
|
} else {
|
||||||
$readonlys['owner'] = true;
|
$readonlys['owner'] = true;
|
||||||
$readonlys['access'] = $content['owner'] != $GLOBALS['egw_info']['user']['account_id'];
|
$readonlys['access'] = $content['owner'] != $GLOBALS['egw_info']['user']['account_id'];
|
||||||
|
Loading…
Reference in New Issue
Block a user