WIP - nodes p4

Author: ivanproskuryakov

Aisel/backend/web/app/Aisel/Kernel/views/edit/field/user.html

@@ -6,7 +6,7 @@
            type="text"
            class="form-control"
            ng-required="true"
-           ng-model="item.frontenduser.id">
+           ng-model="item.user.id">
 </div>
 
 <div class="form-group">
@@ -17,5 +17,5 @@
            type="text"
            class="form-control"
            ng-required="true"
-           ng-model="item.frontenduser.email">
+           ng-model="item.user.email">
 </div>

Aisel/backend/web/app/Aisel/Page/controllers/pageReview.js

@@ -47,7 +47,7 @@ define(['app'], function (app) {
                     enableColumnMenu: false,
                     width: '200'
                 }, {
-                    name: 'frontenduser.email',
+                    name: 'user.email',
                     enableColumnMenu: false,
                     width: '200'
                 }, {

Aisel/backend/web/app/Aisel/Product/controllers/productReview.js

@@ -47,7 +47,7 @@ define(['app'], function (app) {
                     enableColumnMenu: false,
                     width: '200'
                 }, {
-                    name: 'frontenduser.email',
+                    name: 'user.email',
                     enableColumnMenu: false,
                     width: '200'
                 }, {

Aisel/src/Aisel/NavigationBundle/Tests/Controller/Admin/ApiDuplicateParentNodeControllerTest.php

@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Aisel package.
+ *
+ * (c) Ivan Proskuryakov
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Aisel\NavigationBundle\Tests\Controller\Admin;
+
+use Aisel\ResourceBundle\Tests\AbstractWebTestCase;
+use Aisel\NavigationBundle\Entity\Menu;
+
+/**
+ * ApiDuplicateParentNodeControllerTest
+ *
+ * @author Ivan Proskuryakov <volgodark@gmail.com>
+ */
+class ApiDuplicateParentNodeControllerTest extends AbstractWebTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->logInBackend();
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    public function createNode($name)
+    {
+        $node = new Menu();
+        $node->setLocale('en');
+        $node->setMetaUrl('/');
+        $node->setName($name);
+        $node->setStatus(true);
+        $this->em->persist($node);
+        $this->em->flush();
+
+        return $node;
+    }
+
+    public function testCascadeUpdateAction()
+    {
+        $this->markTestSkipped('JMS should not update parent values');
+
+        $child = $this->createNode('Child');
+        $parent = $this->createNode('Parent');
+
+        $data = [
+            'parent' => [
+                'id' => $parent->getId(),
+                'status' => false,
+                'name' => $this->faker->randomNumber(),
+                'meta_url' => $this->faker->randomNumber()
+            ],
+        ];
+
+        $this->client->request(
+            'PUT',
+            '/' . $this->api['backend'] . '/navigation/' . $child->getId(),
+            [],
+            [],
+            ['CONTENT_TYPE' => 'application/json'],
+            json_encode($data)
+        );
+
+
+        $response = $this->client->getResponse();
+        $content = $response->getContent();
+        $statusCode = $response->getStatusCode();
+        $result = json_decode($content, true);
+
+        $this->assertEmpty($content);
+        $this->assertTrue(204 === $statusCode);
+
+        $this->em->clear();
+
+        $node = $this
+            ->em
+            ->getRepository('Aisel\NavigationBundle\Entity\Menu')
+            ->findOneBy(['id' => $child->getId()]);
+
+        $this->assertEquals($parent->getId(), $node->getParent()->getId());
+        $this->assertEquals($child->getId(), $node->getParent()->getChildren()[0]->getId());
+        $this->assertEquals($node->getParent()->getName(), $data['parent']['name']);
+        $this->assertEquals($node->getParent()->getStatus(), $data['parent']['status']);
+        $this->assertEquals($node->getParent()->getMetaUrl(), $data['parent']['meta_url']);
+    }
+
+}

Aisel/src/Aisel/NavigationBundle/Tests/Controller/Admin/ApiNodeControllerTest.php

@@ -39,7 +39,7 @@ public function createNode($name)
         $node->setLocale('en');
         $node->setMetaUrl('/');
         $node->setName($name);
-        $node->setStatus($name);
+        $node->setStatus(true);
         $this->em->persist($node);
         $this->em->flush();
 

Aisel/src/Aisel/ReviewBundle/Entity/Review.php

@@ -51,6 +51,7 @@ abstract class Review
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
      * @JMS\Type("Aisel\UserBundle\Entity\User")
      * @JMS\Expose
+     * @JMS\ReadOnly
      * @JMS\MaxDepth(2)
      * @JMS\Groups({"collection","details"})
      */