extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

The category template starts with 'admin', so we refresh admin or etemplate2 won't find it.

Browse Source
This commit is contained in:
Nathan Gray 2013-12-10 22:23:05 +00:00
parent bc4857c376
commit de840c2d7d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,8 @@ class admin_categories
{ {
$cats->delete($content['id'],$delete_subs,!$delete_subs); $cats->delete($content['id'],$delete_subs,!$delete_subs);
$msg = lang('Category deleted.'); $msg = lang('Category deleted.');
egw_framework::refresh_opener($msg, $appname, $content['id']); // Refresh internally looks for template name, which starts with 'admin'
egw_framework::refresh_opener($msg, 'admin', $content['id']);
egw_framework::window_close(); egw_framework::window_close();
return; return;
} }
@ -190,7 +191,8 @@ class admin_categories
} }
break; break;
} }
egw_framework::refresh_opener($msg, $appname, $content['id']); // Refresh internally looks for template name, which starts with 'admin'
egw_framework::refresh_opener($msg, 'admin', $content['id']);
} }
$content['msg'] = $msg; $content['msg'] = $msg;
if(!$content['appname']) $content['appname'] = $appname; if(!$content['appname']) $content['appname'] = $appname;
@ -426,6 +428,7 @@ class admin_categories
//or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type) //or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
'no_search' => !self::$acl_search, 'no_search' => !self::$acl_search,
'row_id' => 'id', 'row_id' => 'id',
'dataStorePrefix' => 'categories' // Avoid conflict with user list when in admin
); );
$content['nm']['filter'] = $this->appname == 'admin'?categories::GLOBAL_ACCOUNT:$GLOBALS['egw_info']['user']['account_id']; $content['nm']['filter'] = $this->appname == 'admin'?categories::GLOBAL_ACCOUNT:$GLOBALS['egw_info']['user']['account_id'];
} }