extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 15:08:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

take care that the global_cats param survives the edit

Browse Source
This commit is contained in:
Klaus Leithoff 2010-04-13 11:34:03 +00:00
parent a2c8d14a2c
commit 7796500c60
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,11 @@ 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 +170,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')