holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar - now uses standard search (quotes, +/-) including custom fields

Browse Source
This commit is contained in:
nathangray 2017-11-14 09:56:07 -07:00
parent e0303ff189
commit 4a9049f619
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
calendar/inc/class.calendar_so.inc.php
View File

@ -733,24 +733,27 @@ class calendar_so
$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end - 1 AS recur_enddate,".implode(',',$all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date"; $cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end - 1 AS recur_enddate,".implode(',',$all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
} }
$where = array(); $where = array();
$join = '';
if (is_array($params['query'])) if (is_array($params['query']))
{ {
$where = $params['query']; $where = $params['query'];
} }
elseif ($params['query']) elseif ($params['query'])
{ {
if(is_numeric($params['query'])) $columns = array('cal_title','cal_description','cal_location');
$wildcard = $op = null;
if(!is_null($params['cfs']))
{ {
$where[] = $this->cal_table.'.cal_id = ' . (int)$params['query']; $custom = Api\Storage\Customfields::get('calendar');
} if($custom)
else
{
foreach(array('cal_title','cal_description','cal_location') as $col)
{ {
$to_or[] = $col.' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%'.$params['query'].'%'); $columns[] = 'cal_extra_value';
$join .= " LEFT JOIN {$this->extra_table} ON {$this->extra_table}.cal_id = {$this->cal_table}.cal_id ";
} }
$where[] = '('.implode(' OR ',$to_or).')';
} }
$so_sql = new Api\Storage\Base('calendar', $this->cal_table, $this->db);
$where = $so_sql->search2criteria($params['query'], $wildcard, $op, null, $columns);
// Searching - restrict private to own or private grant // Searching - restrict private to own or private grant
if (!isset($params['private_grants'])) if (!isset($params['private_grants']))
@ -881,15 +884,19 @@ class calendar_so
$cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted'); $cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted');
$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table); $cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
$join = "JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ". $u_join = "JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ".
"LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id ". "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id ".
$rejected_by_user_join; $rejected_by_user_join;
// dates table join only needed to enum recuring events, we use a time-range limited view here too // dates table join only needed to enum recuring events, we use a time-range limited view here too
if ($params['enum_recuring']) if ($params['enum_recuring'])
{ {
$join = "JOIN ".$this->dates_table. // using dates_table direct seems quicker then an other view $join .= "JOIN ".$this->dates_table. // using dates_table direct seems quicker then an other view
//$this->dates_range_view($start, $end, null, $filter == 'everything' ? null : $filter == 'deleted'). //$this->dates_range_view($start, $end, null, $filter == 'everything' ? null : $filter == 'deleted').
" ON $this->cal_table.cal_id=$this->dates_table.cal_id ".$join; " ON $this->cal_table.cal_id=$this->dates_table.cal_id ".$u_join;
}
else
{
$join .= $u_join;
} }
// Check for some special sorting, used by planner views // Check for some special sorting, used by planner views