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

fix infologs without any responsible where not displayed, caused by grouping by attendee.info_id

Browse Source
This commit is contained in:
Ralf Becker 2016-09-12 14:38:23 +02:00
parent 1861a9de22
commit 9a242207c0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infolog/inc/class.infolog_so.inc.php
View File

@ -894,8 +894,9 @@ class infolog_so
$distinct = $this->db->capabilities['distinct_on_text'] ? 'DISTINCT' : ''; $distinct = $this->db->capabilities['distinct_on_text'] ? 'DISTINCT' : '';
} }
$join .= " LEFT JOIN $this->users_table ON main.info_id=$this->users_table.info_id"; $join .= " LEFT JOIN $this->users_table ON main.info_id=$this->users_table.info_id";
$join .= " LEFT JOIN $this->users_table attendees ON main.info_id=attendees.info_id"; // do not return deleted attendees
$group_by = ' GROUP BY attendees.info_id '; $join .= " LEFT JOIN $this->users_table attendees ON main.info_id=attendees.info_id AND attendees.info_res_deleted IS NULL";
$group_by = ' GROUP BY main.info_id ';
$pid = 'AND ' . $this->db->expression($this->info_table,array('info_id_parent' => ($action == 'sp' ?$query['action_id'] : 0))); $pid = 'AND ' . $this->db->expression($this->info_table,array('info_id_parent' => ($action == 'sp' ?$query['action_id'] : 0)));
if ($GLOBALS['egw_info']['user']['preferences']['infolog']['listNoSubs'] != '1' && $action != 'sp' || if ($GLOBALS['egw_info']['user']['preferences']['infolog']['listNoSubs'] != '1' && $action != 'sp' ||
@ -946,8 +947,7 @@ class infolog_so
if (is_array($cols)) $cols = implode(',',$cols); if (is_array($cols)) $cols = implode(',',$cols);
$cols .= ','.$this->db->group_concat('attendees.account_id').' AS info_responsible'; $cols .= ','.$this->db->group_concat('attendees.account_id').' AS info_responsible';
$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query. $rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.
// hide deleted attendees $query['append'].$group_by.' '.$ordermethod,__LINE__,__FILE__,
' AND attendees.info_res_deleted IS NULL '.$query['append'].$group_by.' '.$ordermethod,__LINE__,__FILE__,
(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,Api\Db::FETCH_ASSOC); (int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,Api\Db::FETCH_ASSOC);
//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n"; //echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";