Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:44:17 +0000 (21:44 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:44:17 +0000 (21:44 +0200)
Change-Id: I1528ce4669cd329d2c34d1c288bc3d03086cc50b

1  2 
tests/tine20/Tinebase/Frontend/JsonTest.php
tine20/Calendar/Controller/EventNotifications.php
tine20/Calendar/Model/Attender.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/js/widgets/mainscreen/WestPanel.js

@@@ -535,11 -533,7 +535,13 @@@ class Tinebase_Frontend_JsonTest extend
  
          $this->assertTrue(isset($registryData['Timetracker']['models']['Timeaccount']['copyOmitFields']), 'Timeaccount copyOmitFields empty/missing');
          $this->assertEquals($copyOmitFields, $registryData['Timetracker']['models']['Timeaccount']['copyOmitFields']);
+         $this->assertTrue(is_array(($registryData['Timetracker']['relatableModels'][0])), 'relatableModels needs to be an numbered array');
++
 +        $this->assertTrue(isset($registryData['Inventory']['models']['InventoryItem']['export']), 'no InventoryItem export config found: '
 +            . print_r($registryData['Inventory']['models']['InventoryItem'], true));
 +        $this->assertTrue(isset($registryData['Inventory']['models']['InventoryItem']['export']['supportedFormats']));
 +        $this->assertEquals(array('csv', 'ods'), $registryData['Inventory']['models']['InventoryItem']['export']['supportedFormats']);
 +        $this->assertTrue(isset($registryData['Inventory']['models']['InventoryItem']['import']));
      }
  
      /**
Simple merge
Simple merge