Merge pull request #1571 from stefanorosanelli/issue/v4/1568-patch-pr…

…operty-types Issue/v4/1568 patch property types
bedita · Dec 10, 2018 · 5614e85 · 5614e85
2 parents 6b416b0 + 9366e4e
commit 5614e85
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/plugins/BEdita/API/tests/TestCase/Controller/Model/PropertiesControllerTest.php b/plugins/BEdita/API/tests/TestCase/Controller/Model/PropertiesControllerTest.php
@@ -442,9 +442,20 @@ public function testEdit()
 
         $this->configRequestHeaders('PATCH', $this->getUserAuthHeader());
         $this->patch('/model/properties/1', json_encode(compact('data')));
+        $result = json_decode((string)$this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
         $this->assertContentType('application/vnd.api+json');
+
+        unset($result['data']['meta']);
+        $data['attributes'] += [
+            'label' => null,
+            'is_nullable' => true,
+            'property_type_name' => 'string',
+            'object_type_name' => 'documents',
+        ];
+        static::assertEquals($data, $result['data']);
+
         static::assertEquals('nice description', TableRegistry::get('Properties')->get(1)->get('description'));
     }
 

diff --git a/plugins/BEdita/API/tests/TestCase/Controller/Model/PropertyTypesControllerTest.php b/plugins/BEdita/API/tests/TestCase/Controller/Model/PropertyTypesControllerTest.php
@@ -535,9 +535,12 @@ public function testEdit()
 
         $this->configRequestHeaders('PATCH', $this->getUserAuthHeader());
         $this->patch('/model/property_types/1', json_encode(compact('data')));
+        $result = json_decode((string)$this->_response->getBody(), true);
 
         $this->assertResponseCode(200);
         $this->assertContentType('application/vnd.api+json');
+        unset($result['data']['relationships']);
+        static::assertEquals($data, $result['data']);
         static::assertEquals($data['attributes']['params'], TableRegistry::get('PropertyTypes')->get(1)->get('params'));
     }
 

diff --git a/plugins/BEdita/Core/config/reserved.php b/plugins/BEdita/Core/config/reserved.php
@@ -49,4 +49,6 @@
     'trees',
     'tree_nodes',
     'tree_parent_nodes',
+    'type',
+    'types',
 ];
diff --git a/plugins/BEdita/Core/src/Model/Entity/Property.php b/plugins/BEdita/Core/src/Model/Entity/Property.php
@@ -63,6 +63,7 @@ class Property extends Entity implements JsonApiSerializable
         'modified' => false,
         'default' => false,
         'required' => false,
+        'type' => false,
     ];
 
     /**

diff --git a/plugins/BEdita/Core/src/Model/Entity/PropertyType.php b/plugins/BEdita/Core/src/Model/Entity/PropertyType.php
@@ -26,6 +26,14 @@
  */
 class PropertyType extends Entity implements JsonApiSerializable
 {
-
     use JsonApiModelTrait;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected $_accessible = [
+        '*' => false,
+        'name' => true,
+        'params' => true,
+    ];
 }