holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fallback to admin index after save/cancel from calendar ACl,timesheet edit status

Browse Source
This commit is contained in:
Hadi Nategh 2014-07-08 15:10:24 +00:00
parent 2de7931700
commit 0be030f6cb
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -2328,7 +2328,7 @@ class calendar_uiforms extends calendar_ui
} }
if ($button != 'apply') // end dialog if ($button != 'apply') // end dialog
{ {
egw::redirect_link('/index.php',array('menuaction' => $this->view_menuaction)); egw::redirect_link('/admin/index.php', null, 'admin');
} }
} }
$content['rows'] = $preserv['rows'] = array(); $content['rows'] = $preserv['rows'] = array();

6
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -1175,11 +1175,7 @@ class timesheet_ui extends timesheet_bo
if ($button == 'apply') break; if ($button == 'apply') break;
// fall-through // fall-through
case 'cancel': case 'cancel':
$GLOBALS['egw']->redirect_link('/index.php',array( $GLOBALS['egw']->redirect_link('/admin/index.php', null, 'admin');
'menuaction' => 'timesheet.timesheet_ui.index',
'msg' => $msg,
));
break;
} }
} }
if (isset($content['statis']['delete'])) if (isset($content['statis']['delete']))