[Fmsystem-commits] [17039] eventplanner, booking: build joins

[sigurdne]

Revision: 17039
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17039
Author:   sigurdne
Date:     2017-09-05 09:40:49 -0400 (Tue, 05 Sep 2017)
Log Message:
-----------
eventplanner, booking: build joins

Modified Paths:
--------------
    trunk/booking/inc/class.socommon.inc.php
    trunk/eventplanner/inc/class.soapplication.inc.php
    trunk/phpgwapi/inc/class.socommon.inc.php

Modified: trunk/booking/inc/class.socommon.inc.php
===================================================================
--- trunk/booking/inc/class.socommon.inc.php    2017-09-05 11:54:09 UTC (rev 
17038)
+++ trunk/booking/inc/class.socommon.inc.php    2017-09-05 13:40:49 UTC (rev 
17039)
@@ -168,7 +168,7 @@
                        return 
"{$params['join']['table']}_{$params['join']['column']}_{$field}";
                }
 
-               public function _get_cols_and_joins( $filters = array() )
+               public function _get_cols_and_joins( $query = '', $filters = 
array() )
                {
                        $cols = array();
                        $joins = array();
@@ -181,7 +181,7 @@
                                }
                                else if (isset($params['join']) && 
$params['join'])
                                {
-                                       if ($params['join_type'] == 
'manytomany' && !isset($filters[$field]) && !$filters[$field])
+                                       if ($params['join_type'] == 
'manytomany' && ( empty($filters[$field]) && empty($query) ) )
                                        {
                                                continue;
                                        }
@@ -499,7 +499,7 @@
                        $dir = isset($params['dir']) && $params['dir'] ? 
$params['dir'] : 'asc';
                        $query = isset($params['query']) && $params['query'] ? 
$params['query'] : null;
                        $filters = isset($params['filters']) && 
$params['filters'] ? $params['filters'] : array();
-                       $cols_joins = $this->_get_cols_and_joins($filters);
+                       $cols_joins = $this->_get_cols_and_joins($query, 
$filters);
                        $cols = join(',', $cols_joins[0]);
                        $joins = join(' ', $cols_joins[1]);
                        $condition = $this->_get_conditions($query, $filters);

Modified: trunk/eventplanner/inc/class.soapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.soapplication.inc.php  2017-09-05 11:54:09 UTC 
(rev 17038)
+++ trunk/eventplanner/inc/class.soapplication.inc.php  2017-09-05 13:40:49 UTC 
(rev 17039)
@@ -56,9 +56,9 @@
                        return self::$so;
                }
 
-               public function _get_cols_and_joins( $filters = array() )
+               public function _get_cols_and_joins( $query = '', $filters = 
array() )
                {
-                       $cols_joins = parent::_get_cols_and_joins($filters);
+                       $cols_joins = parent::_get_cols_and_joins($query, 
$filters);
 
                        $cols = $cols_joins[0];
                        $joins = $cols_joins[1];

Modified: trunk/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.socommon.inc.php   2017-09-05 11:54:09 UTC (rev 
17038)
+++ trunk/phpgwapi/inc/class.socommon.inc.php   2017-09-05 13:40:49 UTC (rev 
17039)
@@ -215,7 +215,7 @@
                        $filters = isset($params['filters']) && 
$params['filters'] ? $params['filters'] : array();
                        $relaxe_acl = isset($params['relaxe_acl']) && 
$params['relaxe_acl'] ? $params['relaxe_acl'] : false;
                        $this->relaxe_acl = $relaxe_acl;
-                       $cols_joins = $this->_get_cols_and_joins($filters);
+                       $cols_joins = $this->_get_cols_and_joins($query, 
$filters);
                        $cols = join(',', $cols_joins[0]);
                        $joins = join(' ', $cols_joins[1]);
                        $condition = $this->_get_conditions($query, $filters);
@@ -638,7 +638,7 @@
                        return 
"{$params['join']['table']}_{$params['join']['column']}_{$field}";
                }
 
-               public function _get_cols_and_joins( $filters = array() )
+               public function _get_cols_and_joins( $query = '', $filters = 
array() )
                {
                        $cols = array();
                        $joins = array();
@@ -655,7 +655,7 @@
                                }
                                else if (isset($params['join']) && 
$params['join'])
                                {
-                                       if ($params['join_type'] == 
'manytomany' && !isset($filters[$field]) && !$filters[$field])
+                                       if ($params['join_type'] == 
'manytomany' && ( empty($filters[$field]) && empty($query) ) )
                                        {
                                                continue;
                                        }