extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix removed delegation caused edit popup to be empty and no longer finding it with responsible filter and owner

Browse Source
This commit is contained in:
Ralf Becker 2016-09-13 18:02:04 +02:00
parent 38f614d387
commit 7b8ca04290
1 changed files with 5 additions and 3 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

@ -414,14 +414,12 @@ class infolog_so
$where[] = $this->db->expression($this->info_table, $this->info_table.'.', array('info_id' => $where['info_id'])); $where[] = $this->db->expression($this->info_table, $this->info_table.'.', array('info_id' => $where['info_id']));
unset($where['info_id']); unset($where['info_id']);
} }
// hide deleted attendees
if ($where) $where[] = "$this->users_table.info_res_deleted IS NULL";
if (!$where || if (!$where ||
!($this->data = $this->db->select($this->info_table, !($this->data = $this->db->select($this->info_table,
'*,'.$this->db->group_concat('account_id').' AS info_responsible,'.$this->info_table.'.info_id AS info_id', '*,'.$this->db->group_concat('account_id').' AS info_responsible,'.$this->info_table.'.info_id AS info_id',
$where, __LINE__, __FILE__, false, "GROUP BY $this->info_table.info_id", 'infolog', 1, $where, __LINE__, __FILE__, false, "GROUP BY $this->info_table.info_id", 'infolog', 1,
"LEFT JOIN $this->users_table ON $this->info_table.info_id=$this->users_table.info_id")->fetch())) "LEFT JOIN $this->users_table ON $this->info_table.info_id=$this->users_table.info_id AND $this->users_table.info_res_deleted IS NULL")->fetch()))
{ {
$this->init( ); $this->init( );
//error_log(__METHOD__.'('.array2string($where).') returning FALSE'); //error_log(__METHOD__.'('.array2string($where).') returning FALSE');
@ -895,6 +893,10 @@ 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";
if (strpos($query['filter'], '+deleted') === false)
{
$join .= " AND $this->users_table.info_res_deleted IS NULL";
}
// do not return deleted attendees // do not return deleted attendees
$join .= " LEFT JOIN $this->users_table attendees ON main.info_id=attendees.info_id AND attendees.info_res_deleted IS NULL"; $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 '; $group_by = ' GROUP BY main.info_id ';