extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

controlling the col filter for ts_project if projectmanager integration is full, because of strange search results when switching from full to both and back

Browse Source
This commit is contained in:
Klaus Leithoff 2009-09-28 09:25:24 +00:00
parent d875429fcb
commit d19bfc8abf
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -435,11 +435,18 @@ class timesheet_ui extends timesheet_bo
if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
#_debug_array($query['col_filter']);
//_debug_array($query['col_filter']);
//echo "PM Integration:".$this->pm_integration.'<br>';
// PM project filter for the PM integration
if ((string)$query['col_filter']['pm_id'] != '')
if ($this->pm_integration == 'full')
{
unset($query['col_filter']['ts_project']);
}
if ((string)$query['col_filter']['pm_id'] != '' && (string)$query['col_filter']['pm_id'] != '0')
{
//$query['col_filter']['ts_id'] = egw_link::get_links('projectmanager',$query['col_filter']['pm_id'],'timesheet');
$query['col_filter']['ts_id'] = $this->get_ts_links($query['col_filter']['pm_id']);
if (empty($query['col_filter']['ts_id'])) $query['col_filter']['ts_id'] = -1;
if (!$query['col_filter']['ts_id']) $query['col_filter']['ts_id'] = 0;
}
if ((string)$query['col_filter']['pm_id'] != '' && (string)$query['col_filter']['pm_id'] == '0')