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

release session after accounts query was cached (in session)

Browse Source
This commit is contained in:
Ralf Becker 2021-05-16 20:53:38 +02:00
parent aea7a5c0f2
commit 765b95cd49
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/inc/class.admin_ui.inc.php
View File

@ -325,9 +325,6 @@ class admin_ui
*/ */
public static function get_users(array $query, array &$rows=null) public static function get_users(array $query, array &$rows=null)
{ {
// release session to allow parallel requests to run
$GLOBALS['egw']->session->commit_session();
$params = array( $params = array(
'type' => (int)$query['filter'] ? (int)$query['filter'] : 'accounts', 'type' => (int)$query['filter'] ? (int)$query['filter'] : 'accounts',
'start' => $query['start'], 'start' => $query['start'],
@ -374,6 +371,9 @@ class admin_ui
//error_log(__METHOD__."() accounts->search(".array2string($params).") total=".self::$accounts->total); //error_log(__METHOD__."() accounts->search(".array2string($params).") total=".self::$accounts->total);
$total = self::$accounts->total; $total = self::$accounts->total;
// release session (after query got cached!) to allow parallel requests to run
$GLOBALS['egw']->session->commit_session();
foreach($rows as $key => &$row) foreach($rows as $key => &$row)
{ {
// Filter by status // Filter by status
@ -434,9 +434,6 @@ class admin_ui
*/ */
public static function get_groups(&$query, &$rows) public static function get_groups(&$query, &$rows)
{ {
// release session to allow parallel requests to run
$GLOBALS['egw']->session->commit_session();
$groups = $GLOBALS['egw']->accounts->search(array( $groups = $GLOBALS['egw']->accounts->search(array(
'type' => 'groups', 'type' => 'groups',
'query' => $query['search'], 'query' => $query['search'],
@ -446,6 +443,9 @@ class admin_ui
'offset' => (int)$query['num_rows'] 'offset' => (int)$query['num_rows']
)); ));
// release session (after query got cached!) to allow parallel requests to run
$GLOBALS['egw']->session->commit_session();
$apps = array(); $apps = array();
foreach($GLOBALS['egw_info']['apps'] as $app => $data) foreach($GLOBALS['egw_info']['apps'] as $app => $data)
{ {