From bb13f923f8314ea46a32f7b7425a212bc6c3161a Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Mon, 16 Aug 2021 19:24:22 +0800
Subject: [PATCH] fixed self assignment error in Web UI

---
 .../app/controllers/settings/menu/menu.controller.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/admin/app/controllers/settings/menu/menu.controller.js b/admin/app/controllers/settings/menu/menu.controller.js
index 352124da..394fc2e7 100644
--- a/admin/app/controllers/settings/menu/menu.controller.js
+++ b/admin/app/controllers/settings/menu/menu.controller.js
@@ -2,7 +2,6 @@
 
 app.controller('MenuController', function ($scope, $uibModal, MenuService, toaster, $translate) {
 	$scope.menus = [];
-	$scope.currentMenuID = null;
 	$scope.currentMenu = {};
 	$scope.currentMenuChildren = [];
 
@@ -37,8 +36,9 @@ app.controller('MenuController', function ($scope, $uibModal, MenuService, toast
 			angular.element(menutree).jstree(treedata);
 			//menu tree selected changed event handler
 			angular.element(menutree).on("changed.jstree", function (e, data) {
-				$scope.currentMenuID = parseInt(data.selected[0]);
-				$scope.getMenuChildren($scope.currentMenuID);
+				if (data.action === 'select_node') {
+					$scope.getMenuChildren(parseInt(data.selected[0]));
+				};
 			});
 		});
 	};
@@ -104,12 +104,6 @@ app.controller('MenuController', function ($scope, $uibModal, MenuService, toast
 		});
 
 		modalInstance.result.then(function (modifiedMenu) {
-			if (modifiedMenu.parent_menu != null) {
-				modifiedMenu.parent_menu_id = modifiedMenu.parent_menu_id;
-			} else {
-				modifiedMenu.parent_menu_id = null;
-			}
-			
 			MenuService.editMenu(modifiedMenu, function (response) {
 				if (angular.isDefined(response.status) && response.status === 200) {
 					toaster.pop({