From 07b24b2a6049cc0d92cac9216dfdcfceaab66a1d Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 20 Dec 2018 10:45:11 -0700 Subject: [PATCH] Commit session right after we store the state --- addressbook/inc/class.addressbook_ui.inc.php | 1 + filemanager/inc/class.filemanager_ui.inc.php | 1 + infolog/inc/class.infolog_ui.inc.php | 2 ++ resources/inc/class.resources_bo.inc.php | 1 + timesheet/inc/class.timesheet_ui.inc.php | 2 ++ 5 files changed, 7 insertions(+) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 2a9dd521bc..3f88d7f1b8 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1500,6 +1500,7 @@ class addressbook_ui extends addressbook_bo { $old_state = Api\Cache::getSession('addressbook', $what); } + $GLOBALS['egw']->session->commit_session(); if (!isset($this->grouped_views[(string) $query['grouped_view']]) || strpos($query['grouped_view'],':') === false) { // we don't have a grouped view, unset the according col_filters diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php index 7671b4ee5f..5a40b9f63c 100644 --- a/filemanager/inc/class.filemanager_ui.inc.php +++ b/filemanager/inc/class.filemanager_ui.inc.php @@ -908,6 +908,7 @@ class filemanager_ui $rows = array(); return 0; } + $GLOBALS['egw']->session->commit_session(); $rows = $dir_is_writable = array(); $vfs_options = $this->get_vfs_options($query); foreach(Vfs::find(!empty($query['col_filter']['dir']) ? $query['col_filter']['dir'] : $query['path'],$vfs_options,true) as $path => $row) diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 448427064d..5c94afd00e 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -336,6 +336,8 @@ class infolog_ui $query['filter'] = $query['search'] = $query['cat_id'] = ''; $query['col_filter'] = array('info_id_parent' => $query['col_filter']['info_id_parent']); } + + $GLOBALS['egw']->session->commit_session(); $orginal_colfilter = $query['col_filter']; if (isset($parent_id)) $query['col_filter']['info_id_parent'] = (string)$parent_id; diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php index 0558f003a7..cfd282b870 100755 --- a/resources/inc/class.resources_bo.inc.php +++ b/resources/inc/class.resources_bo.inc.php @@ -118,6 +118,7 @@ class resources_bo if ($this->debug) _debug_array($query); $read_onlys = 'res_id,name,short_description,quantity,useable,bookable,buyable,cat_id,location,storage_info'; + $GLOBALS['egw']->session->commit_session(); $filter = array(); $join = ''; $extra_cols = array(); diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php index f0cb550725..0776507036 100644 --- a/timesheet/inc/class.timesheet_ui.inc.php +++ b/timesheet/inc/class.timesheet_ui.inc.php @@ -552,6 +552,8 @@ class timesheet_ui extends timesheet_bo //echo "

show_sums=".print_r($this->show_sums,true)."

\n"; if (!$id_only && !$query_in['csv_export']) Api\Cache::setSession(TIMESHEET_APP, 'index', $query_in); + $GLOBALS['egw']->session->commit_session(); + // Refresh actions (undelete needs this) $query_in['actions'] = $this->get_actions($query_in);