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

Calendar: Show "# more" if there were results not returned

Browse Source
This commit is contained in:
nathan 2022-10-21 11:31:56 -06:00
parent 3df4438b60
commit 0596cb501b
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
calendar/inc/class.calendar_owner_etemplate_widget.inc.php
View File

@ -174,6 +174,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
$search_options; $search_options;
$results = array(); $results = array();
$is_admin = !!($GLOBALS['egw_info']['user']['apps']['admin']); $is_admin = !!($GLOBALS['egw_info']['user']['apps']['admin']);
$total = 0;
// Contacts matching accounts the user does not have permission for cause // Contacts matching accounts the user does not have permission for cause
// confusion as user selects the contact and there's nothing there, so // confusion as user selects the contact and there's nothing there, so
@ -194,21 +195,32 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
$own_groups = Api\Accounts::link_query('',$owngroup_options); $own_groups = Api\Accounts::link_query('',$owngroup_options);
$account_options = $options + array('account_type' => 'both'); $account_options = $options + array('account_type' => 'both');
$_results += $remove_contacts = Api\Accounts::link_query($search_text, $account_options); $_results += $remove_contacts = Api\Accounts::link_query($search_text, $account_options);
$total += $account_options['total'];
if (!empty($_REQUEST['checkgrants'])) if (!empty($_REQUEST['checkgrants']))
{ {
$grants = (array)$GLOBALS['egw']->acl->get_grants('calendar') + $own_groups; $grants = (array)$GLOBALS['egw']->acl->get_grants('calendar') + $own_groups;
$_results = array_intersect_key($_results, $grants); $_results = array_intersect_key($_results, $grants);
// Grants reduces how many results we get. This only works since we do accounts first.
$total = count($_results);
} }
} }
// App provides a custom search function // App provides a custom search function
else if ($data['app'] && $data['search']) else if ($data['app'] && $data['search'])
{ {
$_results = call_user_func_array($data['search'], array($search_text, $options)); $_results = call_user_func_array($data['search'], array($search_text, $options));
if(array_key_exists('total', $options))
{
$total += $options['total'];
}
} }
// Use standard link registry // Use standard link registry
else if ($data['app'] && Link::get_registry($data['app'], 'query')) else if ($data['app'] && Link::get_registry($data['app'], 'query'))
{ {
$_results = Link::query($data['app'], $search_text, $options); $_results = Link::query($data['app'], $search_text, $options);
if(array_key_exists('total', $options))
{
$total += $options['total'];
}
} }
// There are always special cases // There are always special cases
@ -250,6 +262,10 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
$results = array_merge($results, $mapped); $results = array_merge($results, $mapped);
} }
} }
if($total)
{
$results['total'] = $total;
}
Api\Json\Response::get()->data($results); Api\Json\Response::get()->data($results);
} }