mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-04 20:40:14 +01:00
accept global_cats param
This commit is contained in:
parent
7db0cf9d0c
commit
f6a2c159a1
@ -235,10 +235,15 @@ class admin_categories
|
|||||||
{
|
{
|
||||||
throw new egw_exception_assertion_failed(__METHOD__.'($query,...) $query[appname] NOT set!');
|
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);
|
egw_cache::setSession(__CLASS__,'nm',$query);
|
||||||
|
|
||||||
$cats = new categories(categories::GLOBAL_ACCOUNT,$query['appname']);
|
$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)
|
foreach($rows as &$row)
|
||||||
{
|
{
|
||||||
@ -271,7 +276,7 @@ class admin_categories
|
|||||||
*/
|
*/
|
||||||
public function index(array $content=null,$msg='')
|
public function index(array $content=null,$msg='')
|
||||||
{
|
{
|
||||||
//_debug_array($content);
|
//_debug_array($_GET);
|
||||||
|
|
||||||
if(!isset($content))
|
if(!isset($content))
|
||||||
{
|
{
|
||||||
@ -304,6 +309,10 @@ class admin_categories
|
|||||||
{
|
{
|
||||||
$content['nm']['appname'] = $_GET['appname'];
|
$content['nm']['appname'] = $_GET['appname'];
|
||||||
}
|
}
|
||||||
|
if (isset($_GET['global_cats']) && empty($_GET['global_cats'] ))
|
||||||
|
{
|
||||||
|
$content['nm']['global_cats'] = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user