holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If an admin edits a user's category, it becomes a global category.

Browse Source
This commit is contained in:
Nathan Gray 2011-06-27 20:44:43 +00:00
parent 57215ec67c
commit 9a9323e37d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/inc/class.admin_categories.inc.php
View File

@ -212,7 +212,7 @@ class admin_categories
} }
} }
if($content['owner'] > 0 ) if($this->appname != 'admin' && $content['owner'] > 0 )
{ {
$sel_options['owner'][$content['owner']] = common::grab_owner_name($content['owner']); $sel_options['owner'][$content['owner']] = common::grab_owner_name($content['owner']);
} }
@ -223,6 +223,7 @@ class admin_categories
} }
if($this->appname == 'admin' || ($content['id'] && !((int)$content['owner'] > 0))) if($this->appname == 'admin' || ($content['id'] && !((int)$content['owner'] > 0)))
{ {
if($content['owner'] > 0) $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');
foreach($accs as $acc) foreach($accs as $acc)
@ -238,7 +239,7 @@ class admin_categories
if($this->appname == 'admin') if($this->appname == 'admin')
{ {
$content['access'] = 'public'; $content['access'] = 'public';
$readonlys['owner'] = $content['owner'] > 0; $readonlys['owner'] = false;
} 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'];