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

New method Api\Accounts::isHuge() is used to NOT query members and (not yet working) disable the column in group-list

Browse Source
This commit is contained in:
ralf 2022-11-05 09:12:24 +01:00
parent fe1caad9be
commit 5b1fe16e9e
3 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,8 +437,14 @@ class admin_ui
/** /**
* Callback for the nextmatch to get groups * Callback for the nextmatch to get groups
*
* Does NOT set members for huge installations, but return "is_huge" === true in $rows.
*
* @param array &$query
* @param array|null &$rows on return rows plus boolean value for key "is_huge" === Accounts::isHuge()
* @return int total number of rows
*/ */
public static function get_groups(&$query, &$rows) public static function get_groups(array &$query, array &$rows=null)
{ {
$groups = $GLOBALS['egw']->accounts->search(array( $groups = $GLOBALS['egw']->accounts->search(array(
'type' => 'groups', 'type' => 'groups',
@ -463,7 +469,8 @@ class admin_ui
$apps[] = $app; $apps[] = $app;
} }
$rows = array(); $rows = [];
$is_huge = $GLOBALS['egw']->accounts->isHuge();
foreach($groups as &$group) foreach($groups as &$group)
{ {
$run_rights = $GLOBALS['egw']->acl->get_user_applications($group['account_id'], false, false); $run_rights = $GLOBALS['egw']->acl->get_user_applications($group['account_id'], false, false);
@ -475,10 +482,14 @@ class admin_ui
} }
} }
// do NOT set members for huge installations, but return "is_huge" === true in $rows
if (!$is_huge)
{
$group['members'] = $GLOBALS['egw']->accounts->members($group['account_id'],true); $group['members'] = $GLOBALS['egw']->accounts->members($group['account_id'],true);
}
$rows[] = $group; $rows[] = $group;
} }
$rows['is_huge'] = $is_huge;
return $GLOBALS['egw']->accounts->total; return $GLOBALS['egw']->accounts->total;
} }

2
admin/templates/default/index.xet
View File

@ -58,7 +58,7 @@
<columns> <columns>
<column width="30%"/> <column width="30%"/>
<column width="15%"/> <column width="15%"/>
<column width="25%"/> <column width="25%" disabled="@is_huge"/>
<column width="25%"/> <column width="25%"/>
</columns> </columns>
<rows> <rows>

37
api/src/Accounts.php
View File

@ -1513,6 +1513,43 @@ class Accounts
Cache::setCache($this->config['install_id'], __CLASS__, 'account-'.$account_id, $account, self::READ_CACHE_TIMEOUT); Cache::setCache($this->config['install_id'], __CLASS__, 'account-'.$account_id, $account, self::READ_CACHE_TIMEOUT);
} }
/**
* Number of accounts to consider an installation huge
*/
const HUGE_LIMIT = 500;
/**
* Check if instance is huge, has more than self::HUGE_LIMIT=500 users
*
* Can be used to disable features not working well for a huge installation.
*
* @param int|null $set=null to set call with total number of accounts
* @return bool
*/
public function isHuge(int $total=null)
{
return true;
if (isset($total))
{
$is_huge = $total > self::HUGE_LIMIT;
Cache::setInstance(__CLASS__, 'is_huge', $is_huge);
return $is_huge;
}
return Cache::getInstance(__CLASS__, 'is_huge', function()
{
$save_total = $this->total; // save and restore current total, to not have an unwanted side effect
$this->search([
'type' => 'accounts',
'start' => 0,
'offset' => 1,
'active' => false, // as this is set by admin_ui::get_users() and therefore we only return the cached result
]);
$total = $this->total;
$this->total = $save_total;
return $this->isHuge($total);
});
}
/** /**
* Internal functions not meant to use outside this class!!! * Internal functions not meant to use outside this class!!!
*/ */