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

- Use egw_refresh() instead of changing href

Browse Source 
- Listen to csv_export and don't save nextmatch query to session
This commit is contained in:
Nathan Gray 2013-02-14 11:28:15 +00:00
parent 298309074e
commit 90fa3a8287
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,10 +246,7 @@ class timesheet_ui extends timesheet_bo
egw_link::link(TIMESHEET_APP,$this->data['ts_id'],$content['link_to']['to_id']); egw_link::link(TIMESHEET_APP,$this->data['ts_id'],$content['link_to']['to_id']);
} }
} }
$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php',array( $js = "opener.egw_refresh('$msg','timesheet','{$this->data['ts_id']}', '" . ($content['ts_id'] ? 'update' : 'add')."');";
'menuaction' => $referer,
'msg' => $msg,
))."';";
if ($button == 'apply') break; if ($button == 'apply') break;
if ($button == 'save_new') if ($button == 'save_new')
{ {
@ -280,7 +277,7 @@ class timesheet_ui extends timesheet_bo
if ($this->delete()) if ($this->delete())
{ {
$msg = lang('Entry deleted'); $msg = lang('Entry deleted');
$js = "opener.location.href=opener.location.href+'&msg=$msg';"; $js = "opener.egw_refresh('$msg','timesheet','{$this->data['ts_id']}', 'delete');";
} }
else else
{ {
@ -513,7 +510,7 @@ class timesheet_ui extends timesheet_bo
} }
} }
//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n"; //echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
if (!$id_only) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in); if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
// Refresh actions (undelete needs this) // Refresh actions (undelete needs this)
$query_in['actions'] = $this->get_actions($query_in); $query_in['actions'] = $this->get_actions($query_in);