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

Restore 'All categories' for preferences

Browse Source
This commit is contained in:
Nathan Gray 2011-06-22 19:59:22 +00:00
parent a7bccd968c
commit a9cd9ed96d
1 changed files with 2 additions and 3 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

@ -373,6 +373,7 @@ class admin_categories
'get_rows' => $this->get_rows, // I method/callback to request the data for the rows eg. 'notes.bo.get_rows' 'get_rows' => $this->get_rows, // I method/callback to request the data for the rows eg. 'notes.bo.get_rows'
'no_filter' => ($appname == categories::GLOBAL_APPNAME),// Can't have personal categories in global 'no_filter' => ($appname == categories::GLOBAL_APPNAME),// Can't have personal categories in global
'options-filter' => array( 'options-filter' => array(
'' => lang('All categories'),
categories::GLOBAL_ACCOUNT => lang('Global categories'), categories::GLOBAL_ACCOUNT => lang('Global categories'),
$GLOBALS['egw_info']['user']['account_id'] => lang('Own categories'), $GLOBALS['egw_info']['user']['account_id'] => lang('Own categories'),
), ),
@ -441,10 +442,8 @@ class admin_categories
$content['add_link']= $this->add_link.'&appname='.$appname; $content['add_link']= $this->add_link.'&appname='.$appname;
$content['edit_link']= $this->edit_link.'&appname='.$appname; $content['edit_link']= $this->edit_link.'&appname='.$appname;
$readonlys['add'] = !self::$acl_add; $readonlys['add'] = !self::$acl_add;
if($GLOBALS['egw_info']['user']['apps']['admin']) if(!$GLOBALS['egw_info']['user']['apps']['admin'])
{ {
$content['nm']['options-filter'][''] = lang('All categories');
} else {
$readonlys['nm']['rows']['owner'] = true; $readonlys['nm']['rows']['owner'] = true;
$readonlys['nm']['col_filter']['owner'] = true; $readonlys['nm']['col_filter']['owner'] = true;
} }