[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14648] more on bookingfrontend
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14648] more on bookingfrontend |
Date: |
Thu, 14 Jan 2016 15:25:47 +0000 |
Revision: 14648
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14648
Author: sigurdne
Date: 2016-01-14 15:25:46 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
more on bookingfrontend
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.soresource.inc.php
Modified: branches/dev-syncromind/booking/inc/class.soresource.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.soresource.inc.php
2016-01-14 15:16:08 UTC (rev 14647)
+++ branches/dev-syncromind/booking/inc/class.soresource.inc.php
2016-01-14 15:25:46 UTC (rev 14648)
@@ -95,10 +95,11 @@
function _get_conditions($query, $filters)
{
static $custom_fields_arr = array();
+ $conditions = parent::_get_conditions($query, $filters);
+
+ $soactivity =
createObject('booking.soactivity');
$activity_ids = array();
- $soactivity =
createObject('booking.soactivity');
- $conditions = parent::_get_conditions($query, $filters);
$custom_condition_arr = array();
$custom_fields_criteria = array();
@@ -200,11 +201,10 @@
{
$_conditions[] = '(' . $conditions . ' AND
activity_id IN ('. implode(',', $__activity_ids) . '))';
}
- else
+
+ if(!$_conditions)
{
-
- // $_conditions[] = $conditions;
-
+ $_conditions[] = $conditions;
}
$conditions = implode(' OR ', $_conditions);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14648] more on bookingfrontend,
Sigurd Nes <=