extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

set the default for global_cats parameter to true\nreset start to 0, if we come back or view another apps categories\ntake care that the global_cats param survives the edit

Browse Source
This commit is contained in:
Klaus Leithoff 2010-04-13 11:45:22 +00:00
parent f6a2c159a1
commit 4a1fec7207
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,10 @@ class admin_categories
*/ */
public function edit(array $content=null,$msg='') public function edit(array $content=null,$msg='')
{ {
// read the session, as the global_cats param is stored with it.
$session = egw_cache::getSession(__CLASS__,'nm');
$global_cats = $session['global_cats'];
unset($session);
if (!isset($content)) if (!isset($content))
{ {
if (!(isset($_GET['cat_id']) && $_GET['cat_id'] > 0 && if (!(isset($_GET['cat_id']) && $_GET['cat_id'] > 0 &&
@ -165,6 +169,7 @@ class admin_categories
$link = egw::link('/index.php',array( $link = egw::link('/index.php',array(
'menuaction' => 'admin.admin_categories.index', 'menuaction' => 'admin.admin_categories.index',
'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')
@ -304,11 +309,16 @@ class admin_categories
'no_search' => !self::$acl_search, 'no_search' => !self::$acl_search,
); );
} }
else
{
$content['nm']['start']=0;
}
if (isset($_GET['appname']) && ($_GET['appname'] == categories::GLOBAL_APPNAME || if (isset($_GET['appname']) && ($_GET['appname'] == categories::GLOBAL_APPNAME ||
isset($GLOBALS['egw_info']['apps'][$_GET['appname']]))) isset($GLOBALS['egw_info']['apps'][$_GET['appname']])))
{ {
$content['nm']['appname'] = $_GET['appname']; $content['nm']['appname'] = $_GET['appname'];
} }
$content['nm']['global_cats'] = true;
if (isset($_GET['global_cats']) && empty($_GET['global_cats'] )) if (isset($_GET['global_cats']) && empty($_GET['global_cats'] ))
{ {
$content['nm']['global_cats'] = false; $content['nm']['global_cats'] = false;