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

accept global_cats param

Browse Source
This commit is contained in:
Klaus Leithoff 2010-04-13 10:29:05 +00:00
parent 7db0cf9d0c
commit f6a2c159a1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,10 +235,15 @@ class admin_categories
{
throw new egw_exception_assertion_failed(__METHOD__.'($query,...) $query[appname] NOT set!');
}
$globalcat = true;
if (isset($query['global_cats']) && $query['global_cats']===false)
{
$globalcat = false;
}
egw_cache::setSession(__CLASS__,'nm',$query);
$cats = new categories(categories::GLOBAL_ACCOUNT,$query['appname']);
$rows = $cats->return_sorted_array($query['start'],$query['num_rows'],$query['search'],$query['sort'],$query['order'],true,0,true);
$rows = $cats->return_sorted_array($query['start'],$query['num_rows'],$query['search'],$query['sort'],$query['order'],$globalcat,0,true);
foreach($rows as &$row)
{
@ -271,7 +276,7 @@ class admin_categories
*/
public function index(array $content=null,$msg='')
{
//_debug_array($content);
//_debug_array($_GET);
if(!isset($content))
{
@ -304,6 +309,10 @@ class admin_categories
{
$content['nm']['appname'] = $_GET['appname'];
}
if (isset($_GET['global_cats']) && empty($_GET['global_cats'] ))
{
$content['nm']['global_cats'] = false;
}
}
else
{