extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 09:58:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix re-setting filter - set private to readonly if not in admin section, and user is not category owner

Browse Source
This commit is contained in:
Nathan Gray 2011-06-22 19:01:00 +00:00
parent 52e8ccef0d
commit bef50c4dbc
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,6 @@ class admin_categories
'menuaction' => $this->list_link, 'menuaction' => $this->list_link,
'appname' => $appname, 'appname' => $appname,
'msg' => $msg, 'msg' => $msg,
'global_cats' => (empty($global_cats)? false : true),
)); ));
$js = "window.opener.location='$link';"; $js = "window.opener.location='$link';";
if ($button == 'save' || $button == 'delete') if ($button == 'save' || $button == 'delete')
@ -207,6 +206,11 @@ class admin_categories
{ {
$sel_options['owner'][$content['owner']] = common::grab_owner_name($content['owner']); $sel_options['owner'][$content['owner']] = common::grab_owner_name($content['owner']);
} }
// Add 'All users', in case owner is readonlys
if($content['id'] && $content['owner'] == 0)
{
$sel_options['owner'][0] = lang('All users');
}
if($this->appname == 'admin') if($this->appname == 'admin')
{ {
$sel_options['owner'][0] = lang('All users'); $sel_options['owner'][0] = lang('All users');
@ -219,8 +223,10 @@ class admin_categories
} }
} }
$content['no_private'] = true; $content['no_private'] = true;
} else {
$readonlys['owner'] = true;
$readonlys['access'] = $content['owner'] != $GLOBALS['egw_info']['user']['account_id'];
} }
$readonlys['owner'] = $this->appname != 'admin' && !$GLOBALS['egw_info']['user']['apps']['admin'];
egw_framework::validate_file('.','global_categories','admin'); egw_framework::validate_file('.','global_categories','admin');
egw_framework::set_onload('$(document).ready(function() { egw_framework::set_onload('$(document).ready(function() {
@ -375,12 +381,12 @@ class admin_categories
'no_search' => !self::$acl_search, 'no_search' => !self::$acl_search,
'row_id' => 'id', 'row_id' => 'id',
); );
$content['nm']['filter'] = $GLOBALS['egw_info']['flags']['currentapp'] == 'admin'?categories::GLOBAL_ACCOUNT:$GLOBALS['egw_info']['user']['account_id'];
} }
else else
{ {
$content['nm']['start']=0; $content['nm']['start']=0;
} }
$content['nm']['filter'] = $GLOBALS['egw_info']['flags']['currentapp'] == 'admin'?categories::GLOBAL_ACCOUNT:$GLOBALS['egw_info']['user']['account_id'];
$content['nm']['appname'] = $appname = $_GET['appname'] ? $_GET['appname'] : $appname; $content['nm']['appname'] = $appname = $_GET['appname'] ? $_GET['appname'] : $appname;
$content['nm']['actions'] = $this->get_actions($appname); $content['nm']['actions'] = $this->get_actions($appname);