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

Infolog: Export filtering with info_contact

Browse Source
This commit is contained in:
nathangray 2020-07-14 15:26:02 -06:00
parent 3dd30b1ee1
commit a90acac0f4
2 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infolog/inc/class.infolog_export_csv.inc.php
View File

@ -90,6 +90,15 @@ class infolog_export_csv implements importexport_iface_export_plugin
} }
$query['num_rows'] = 500; $query['num_rows'] = 500;
$query['start'] = 0; $query['start'] = 0;
if ($query['col_filter']['info_contact'])
{
$ui = new infolog_ui();
$link_filters['linked'] = $query['col_filter']['info_contact'];
$links['linked'] = array();
unset($query['col_filter']['info_contact']);
$rows = array();
$linked = $ui->link_filters($links, $link_filters, $query, $rows);
}
do do
{ {
$selection = $this->bo->search($query); $selection = $this->bo->search($query);

87
infolog/inc/class.infolog_ui.inc.php
View File

@ -358,40 +358,13 @@ class infolog_ui
$link_filters['action'] = array('app'=>$query['action'], 'id' => $query['action_id']); $link_filters['action'] = array('app'=>$query['action'], 'id' => $query['action_id']);
$links['action'] = array(); $links['action'] = array();
} }
foreach($link_filters as $key => $link)
{
if(!is_array($link))
{
// Legacy string style
list($app,$id) = explode(':',$link);
}
else
{
// Full info
$app = $link['app'];
$id = $link['id'];
}
if(!is_array($id)) $id = explode(',',$id);
if (!($linked = Link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
{
$rows = array(); // no infologs linked to selected link --> no rows to return
return 0;
}
// Process links
foreach($linked as $infos) $linked = $this->link_filters($links, $link_filters, $query, $rows);
{ if($linked === 0)
$links[$key] = array_merge($links[$key],$infos);
}
$links[$key] = array_unique($links[$key]);
if($key == 'linked')
{
$linked = array('app' => $app, 'id' => $id, 'title' => (count($id) == 1 ? Link::title($app, $id) : lang('multiple')));
}
}
if(count($links))
{ {
$query['col_filter']['info_id'] = count($links) > 1 ? call_user_func_array('array_intersect', $links) : $links[$key]; // Link filter but no results, early exit
return 0;
} }
// check if we have a custom, type-specific template // check if we have a custom, type-specific template
@ -576,6 +549,56 @@ class infolog_ui
return $query['total']; return $query['total'];
} }
/**
* Deal with link filters and translate them into something we can filter on, ids.
*
* @param $links
* @param $link_filters
* @param $query
* @param $rows
* @return int
*/
public function link_filters(&$links, $link_filters, &$query, &$rows)
{
foreach($link_filters as $key => $link)
{
if(!is_array($link))
{
// Legacy string style
list($app,$id) = explode(':',$link);
}
else
{
// Full info
$app = $link['app'];
$id = $link['id'];
}
if(!is_array($id)) $id = explode(',',$id);
if (!($linked = Link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
{
$rows = array(); // no infologs linked to selected link --> no rows to return
return 0;
}
foreach($linked as $infos)
{
$links[$key] = array_merge($links[$key],$infos);
}
$links[$key] = array_unique($links[$key]);
if($key == 'linked')
{
$linked = array('app' => $app, 'id' => $id, 'title' => (count($id) == 1 ? Link::title($app, $id) : lang('multiple')));
}
}
if(count($links))
{
$query['col_filter']['info_id'] = count($links) > 1 ? call_user_func_array('array_intersect', $links) : $links[$key];
}
return $linked;
}
/** /**
* Hook for timesheet to set some extra data and links * Hook for timesheet to set some extra data and links
* *