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

Fallback to admin index after save/cancel from edit Custom fields or Site configuration

Browse Source
This commit is contained in:
Hadi Nategh 2014-07-08 14:15:48 +00:00
parent f864753113
commit fb37282a2c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/inc/class.customfields.inc.php
View File

@ -125,12 +125,11 @@ class customfields
{ {
break; break;
} }
//fall through
case 'cancel': case 'cancel':
$GLOBALS['egw']->redirect_link($content['referer'] ? $content['referer'] : '/admin/index.php'); egw::redirect_link('/admin/index.php', null, 'admin');
exit;
} }
} }
$referer = $content['referer'];
} }
else else
{ {
@ -140,8 +139,6 @@ class customfields
$this->content_type = $content_types[0]; $this->content_type = $content_types[0];
} }
$content['use_private'] = !isset($_GET['use_private']) || (boolean)$_GET['use_private']; $content['use_private'] = !isset($_GET['use_private']) || (boolean)$_GET['use_private'];
$referer = $GLOBALS['egw']->common->get_referer();
} }
$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields'); $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
$sel_options = array(); $sel_options = array();
@ -223,7 +220,6 @@ class customfields
$this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array( $this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array(
'fields' => $preserv_fields, 'fields' => $preserv_fields,
'appname' => $this->appname, 'appname' => $this->appname,
'referer' => $referer,
'use_private' => $content['use_private'], 'use_private' => $content['use_private'],
)); ));
} }