extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Admins can't edit global categories if they're not in Admin app

Browse Source
This commit is contained in:
Nathan Gray 2011-06-22 19:54:41 +00:00
parent 0aa3d448a6
commit a7bccd968c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ class admin_categories
$appname = categories::GLOBAL_APPNAME; $appname = categories::GLOBAL_APPNAME;
} }
} }
elseif (!self::$acl_edit || (!$GLOBALS['egw_info']['user']['apps']['admin'] && $content['owner'] != $GLOBALS['egw_info']['user']['account_id'])) elseif (!self::$acl_edit || ( $content['owner'] != $GLOBALS['egw_info']['user']['account_id'] && $this->appname != 'admin'))
{ {
// only allow to view category // only allow to view category
$readonlys['__ALL__'] = true; $readonlys['__ALL__'] = true;
@ -236,7 +236,7 @@ class admin_categories
});'); });');
$readonlys['button[delete]'] = !$content['id'] || !self::$acl_delete || // cant delete not yet saved category $readonlys['button[delete]'] = !$content['id'] || !self::$acl_delete || // cant delete not yet saved category
(!$GLOBALS['egw_info']['user']['apps']['admin'] && $content['owner'] != $GLOBALS['egw_info']['user']['account_id']); ($this->appname != 'admin' && $content['owner'] != $GLOBALS['egw_info']['user']['account_id']);
$tmpl = new etemplate('admin.categories.edit'); $tmpl = new etemplate('admin.categories.edit');
$tmpl->exec($this->edit_link,$content,$sel_options,$readonlys,$content+array( $tmpl->exec($this->edit_link,$content,$sel_options,$readonlys,$content+array(