fix(Calendar): multiple calendar filters not working

Change-Id: Ia819ffbef85eb419d8c97bd2d8aeecb8127349d3 Reviewed-on: http://gerrit.tine20.com/customers/14013 Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de> Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
tine20 · Sep 13, 2019 · 622e791 · 622e791
1 parent 97adb0c
commit 622e791
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/tests/tine20/Tinebase/UserTest.php b/tests/tine20/Tinebase/UserTest.php
@@ -215,6 +215,7 @@ protected function _assertPolicy($pw, $expectedMessage, $pwIsValid = FALSE)
                 }
             }
         }
+
     }
 
     /**

diff --git a/tine20/Calendar/Backend/Sql.php b/tine20/Calendar/Backend/Sql.php
@@ -211,22 +211,6 @@ public function search(Tinebase_Model_Filter_FilterGroup $_filter = NULL, Tineba
         // and the calendar filter is used in the UI to
         $clonedFilters = clone $_filter;
 
-        $calendarFilter = null;
-        unset($func); // !!! very important, don't separate this and the next line
-        $func = function($filter) use (/*yes & !*/&$func, &$calendarFilter, $translate) {
-            if ($filter instanceof Calendar_Model_EventFilter) {
-                $filter->filterWalk($func);
-            } elseif ($filter instanceof Calendar_Model_CalendarFilter && strpos($filter->getOperator(), 'not') !== 0) {
-                if ($calendarFilter !== null) {
-                    throw new Tinebase_Exception_SystemGeneric($translate->_('You can not have more than one calendar filter'));
-                }
-                $calendarFilter = $filter;
-                $filter->getParent()->removeFilter($filter);
-            }
-        };
-        $clonedFilters->filterWalk($func);
-
-
         // sort filters, roleFilter und statusFilter need to be processed after attenderFilter
         unset($func); // !!! very important, don't separate this and the next line
         $tempFilters = [];
@@ -251,19 +235,6 @@ public function search(Tinebase_Model_Filter_FilterGroup $_filter = NULL, Tineba
         $select->group($this->_tableName . '.' . 'id');
         Tinebase_Backend_Sql_Abstract::traitGroup($select);
 
-        if ($calendarFilter) {
-            $select1 = clone $select;
-            $select2 = clone $select;
-
-            $calendarFilter->appendFilterSql1($select1, $this);
-            $calendarFilter->appendFilterSql2($select2, $this);
-
-            $select = $this->getAdapter()->select()->union(array(
-                $select1,
-                $select2
-            ));
-        }
-
         $_pagination->appendPaginationSql($select);
 
         $stmt = $this->_db->query($select);