R53398 - in /branches/14.2/calendar/inc: class.calendar_so.inc.php class.calendar_uilist.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 53398

URL: http://svn.stylite.de/viewvc/egroupware?rev=53398&view=rev
Log:
allow to use nextmatch filters in calendar list-view

Modified:
branches/14.2/calendar/inc/class.calendar_so.inc.php
branches/14.2/calendar/inc/class.calendar_uilist.inc.php

Modified: branches/14.2/calendar/inc/class.calendar_so.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_so.inc.php?rev=53398&r1=53397&r2=53398&view=diff

— branches/14.2/calendar/inc/class.calendar_so.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_so.inc.php Tue Aug 18 11:06:38 2015
@@ -687,7 +687,7 @@
* Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
* array: everything is directly used as $where
* @param string $params[‘order’] =‘cal_start’ column-names plus optional DESC|ASC separted by comma

    • @param string $params[‘sql_filter’] sql to be and’ed into query (fully quoted)
    • @param string|array $params[‘sql_filter’] sql to be and’ed into query (fully quoted), or usual filter array
    • @param string|array $params[‘cols’] what to select, default “$this->repeats_table.,$this->cal_table.,cal_start,cal_end,cal_recur_date”,
    •  				if specified and not false an iterator for the rows is returned
    • @param string $params[‘append’] SQL to append to the query before $order, eg. for a GROUP BY clause
      @@ -746,9 +746,16 @@
      $private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array(‘cal_owner’ => $params[‘private_grants’])) . ‘)’;
      $where[] = $private_filter;
      }
  •   if (!empty($params['sql_filter']) && is_string($params['sql_filter']))

  •   {

  •   	$where[] = $params['sql_filter'];

  •   if (!empty($params['sql_filter']))

  •   {

  •   	if (is_string($params['sql_filter']))

  •   	{

  •   		$where[] = $params['sql_filter'];

  •   	}

  •   	elseif(is_array($params['sql_filter']))

  •   	{

  •   		$where = array_merge($where, $params['sql_filter']);

  •   	}
  }
  if ($users)
  {

Modified: branches/14.2/calendar/inc/class.calendar_uilist.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_uilist.inc.php?rev=53398&r1=53397&r2=53398&view=diff

— branches/14.2/calendar/inc/class.calendar_uilist.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_uilist.inc.php Tue Aug 18 11:06:38 2015
@@ -373,6 +373,17 @@
{
$search_params[‘users’] = explode(’,’,$this->owner);
}

  •   if ($params['col_filter'])

  •   {

  •   	$col_filter = array();

  •   	foreach($params['col_filter'] as $name => $val)

  •   	{

  •   		if ($name != 'participants' && (string)$val !== '')

  •   		{

  •   			$col_filter[$name] = $val;

  •   		}

  •   	}

  •   }
  $rows = $js_integration_data = array();
  if ($label)
  {

@@ -381,7 +392,7 @@
$rows[‘sel_options’][‘filter’] = $this->date_filters;
$rows[‘sel_options’][‘filter’][$params[‘filter’]] = $label;
}

  •   foreach((array) $this->bo->search($search_params) as $event)

  •   foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
  {
  	if (!$this->bo->check_perms(EGW_ACL_EDIT,$event))
  	{

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs