WIP - fixing voting / p7

Author: ivanproskuryakov

Aisel/backend/web/app/Aisel/Kernel/views/edit/field/nodes-parent.html

@@ -1,19 +1,10 @@
 <div class="form-group">
-    <label for="nodes">Parent</label>
-    <select id="nodes"
+    <label for="nodes">Parent:</label>
+    {{item.parent.id}} / {{item.parent.name}}
+    <select ng-model="item.parent"
+            id="nodes"
             class="form-control"
-            ng-required="true"
-            ng-model="item.parent.id"
-            name="status">
-        <option
-                ng-repeat="node in availableNodes"
-                ng-select="item.parent.id == node.id"
-                value="{{node.id}}">
-            {{node.id}} / {{node.name}}
-        </option>
+            ng-options="node.name for node in availableNodes">
     </select>
 
-</div>
-
-{{item.parent.id}}
-{{item.parent.name}}
+</div>

Aisel/backend/web/app/Aisel/Navigation/controllers/navigationDetails.js

@@ -30,16 +30,16 @@ define(['app'], function (app) {
             var itemService = new resourceService('navigation');
 
 
-            //$scope.$watch('item.locale', function () {
-            //    if ($scope.item.locale) {
-            //        var filter = '{"locale":"' + $scope.item.locale + '"}';
-            //        itemService.getCollection(100000, 1, filter).success(
-            //            function (data, status) {
-            //                $scope.availableNodes = data.collection;
-            //            }
-            //        );
-            //    }
-            //});
+            $scope.$watch('item.locale', function () {
+                if ($scope.item.locale) {
+                    var filter = '{"locale":"' + $scope.item.locale + '"}';
+                    itemService.getCollection(100000, 1, filter).success(
+                        function (data, status) {
+                            $scope.availableNodes = data.collection;
+                        }
+                    );
+                }
+            });
 
             angular.extend(this, $controller('AbstractDetailsCtrl', {
                 $scope: $scope,

Aisel/backend/web/app/Aisel/Navigation/views/edit-node.html

@@ -19,7 +19,7 @@
                                    ng-required="true"
                                    ng-model="item.name">
                         </div>
-                        <!--<ng-include src="'/app/Aisel/Kernel/views/edit/field/nodes-parent.html'"></ng-include>-->
+                        <ng-include src="'/app/Aisel/Kernel/views/edit/field/nodes-parent.html'"></ng-include>
                         <ng-include src="'/app/Aisel/Kernel/views/edit/field/locale.html'"></ng-include>
                         <ng-include src="'/app/Aisel/Kernel/views/edit/field/status.html'"></ng-include>
                     </div>

Aisel/src/Aisel/NavigationBundle/Entity/Menu.php

@@ -33,7 +33,7 @@ class Menu extends BaseNode
      * @ORM\ManyToOne(targetEntity="Aisel\NavigationBundle\Entity\Menu", inversedBy="children")
      * @ORM\JoinColumn(name="parent_id", referencedColumnName="id", onDelete="CASCADE")
      * @JMS\Expose
-     * @JMS\MaxDepth(1)
+     * @JMS\MaxDepth(2)
      * @JMS\Type("Aisel\NavigationBundle\Entity\Menu")
      * @JMS\Groups({"collection","details"})
      */
@@ -43,7 +43,7 @@ class Menu extends BaseNode
      * @ORM\OneToMany(targetEntity="Aisel\NavigationBundle\Entity\Menu", mappedBy="parent")
      * @ORM\OrderBy({"name" = "ASC"})
      * @JMS\Expose
-     * @JMS\MaxDepth(1)
+     * @JMS\MaxDepth(2)
      * @JMS\Type("ArrayCollection<Aisel\NavigationBundle\Entity\Menu>")
      * @JMS\Groups({"collection","details"})
      */

Aisel/src/Aisel/NodeBundle/Entity/Node.php

@@ -109,7 +109,12 @@ public function getChildren()
      */
     public function setParent($parent = null)
     {
+        if ($this->parent) {
+            $this->parent->removeChild($this);
+        }
+
         $this->parent = $parent;
+        $this->parent->addChild($this);
 
         return $this;
     }