Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Nov 2016 14:00:05 +0000 (15:00 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Nov 2016 14:00:05 +0000 (15:00 +0100)
Change-Id: I914c6723915844e354444aad3c34732f433cca2d

1  2 
tests/tine20/AllTests.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tests/tine20/Filemanager/Frontend/JsonTests.php
tests/tine20/TestCase.php
tests/tine20/Tinebase/ApplicationTest.php
tine20/Felamimail/Message.php
tine20/Filemanager/Controller/Node.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/CustomField.php
tine20/Tinebase/FileSystem.php
tine20/Tinebase/Record/DoctrineMappingDriver.php

Simple merge
Simple merge
Simple merge
@@@ -182,10 -183,10 +183,10 @@@ class Filemanager_Controller_Node exten
       * @param string|optional $_action
       * @return Tinebase_Record_RecordSet of Tinebase_Model_Tree_Node
       */
 -    public function search(Tinebase_Model_Filter_FilterGroup $_filter = NULL, Tinebase_Record_Interface $_pagination = NULL, $_getRelations = FALSE, $_onlyIds = FALSE, $_action = 'get')
 +    public function search(Tinebase_Model_Filter_FilterGroup $_filter = NULL, Tinebase_Model_Pagination $_pagination = NULL, $_getRelations = FALSE, $_onlyIds = FALSE, $_action = 'get')
      {
          // perform recursive search on recursive filter set
-         if($_filter->getFilter('recursive')) {
+         if ($_filter->getFilter('recursive')) {
              return $this->_searchNodesRecursive($_filter, $_pagination);
          } else {
              $path = $this->_checkFilterACL($_filter, $_action);
Simple merge
Simple merge
@@@ -23,23 -23,22 +23,24 @@@ class Tinebase_Record_DoctrineMappingDr
      /**
       * @var array modelConfigType => Doctrine2Type
       */
-     protected static $_typeMap= array(
+     protected static $_typeMap = array(
 -        'string'    => 'string',
 -        'text'      => 'text',
 -        'datetime'  => 'datetime',
 -        'date'      => 'datetime',
 -        'time'      => 'datetime',
 -        'integer'   => 'integer',
 -        'float'     => 'float',
 -        'json'      => 'text',
 -        'container' => 'integer',
 -        'record'    => 'string',
 -        'keyfield'  => 'string',
 -        'user'      => 'string',
 +        'string'        => 'string',
 +        'text'          => 'text',
 +        'datetime'      => 'datetime',
 +        'date'          => 'datetime',
 +        'time'          => 'datetime',
 +        'integer'       => 'integer',
 +        'numberableInt' => 'integer',
 +        'numberableStr' => 'string',
++        'float'         => 'float',
 +        'json'          => 'text',
 +        'container'     => 'integer',
 +        'record'        => 'string',
 +        'keyfield'      => 'string',
 +        'user'          => 'string',
          // NOTE 1: smallint is not working somehow ...
          // NOTE 2: we need int here because otherwise we need to typecast values for pgsql
 -        'boolean'   => 'integer',
 +        'boolean'       => 'integer',
      );
  
      /**