0012862: relation type cannot be set/changed

Change-Id: If3b75b0c17e848dd4b2cf0a623f61e5090a0b05a
Reviewed-on: http://gerrit.tine20.com/customers/4432
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>

diff --git a/tests/tine20/Tinebase/Frontend/JsonTest.php b/tests/tine20/Tinebase/Frontend/JsonTest.php
index 1004cda..42720e0 100644 (file)
--- a/tests/tine20/Tinebase/Frontend/JsonTest.php
+++ b/tests/tine20/Tinebase/Frontend/JsonTest.php
@@ -533,6 +533,7 @@ class Tinebase_Frontend_JsonTest extends TestCase
 
         $this->assertTrue(isset($registryData['Timetracker']['models']['Timeaccount']['copyOmitFields']), 'Timeaccount copyOmitFields empty/missing');
         $this->assertEquals($copyOmitFields, $registryData['Timetracker']['models']['Timeaccount']['copyOmitFields']);
 
         $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');

     }
 
     /**
     }
 
     /**

diff --git a/tine20/Tinebase/Frontend/Json.php b/tine20/Tinebase/Frontend/Json.php
index 7e4792b..c27ff23 100644 (file)
--- a/tine20/Tinebase/Frontend/Json.php
+++ b/tine20/Tinebase/Frontend/Json.php
@@ -959,7 +959,7 @@ class Tinebase_Frontend_Json extends Tinebase_Frontend_Json_Abstract
 
         // TODO get this from app controller / modelconfig
         foreach ($applicationJson->getRelatableModels() as $relModel) {
 
         // TODO get this from app controller / modelconfig
         foreach ($applicationJson->getRelatableModels() as $relModel) {

-            $registryData[$relModel['ownApp']]['relatableModels'][] = $relModel;
+            $registryData['relatableModels'][] = $relModel;

         }
         $registryData['models'] = $applicationJson->getModelsConfiguration();
         $registryData['defaultModel'] = $applicationJson->getDefaultModel();
         }
         $registryData['models'] = $applicationJson->getModelsConfiguration();
         $registryData['defaultModel'] = $applicationJson->getDefaultModel();