YangUI - quickfix operational list form

[dlux.git] / modules / yangui-resources / src / main / resources / yangui / controllers / yangui.controller.js

diff --git a/modules/yangui-resources/src/main/resources/yangui/controllers/yangui.controller.js b/modules/yangui-resources/src/main/resources/yangui/controllers/yangui.controller.js
index 99000d6abe7ee8b8a16fad49d5b5d75dea8c933b..751e4fb70f5996b3b0c84c5a0b6d269ffacc572c 100644 (file)
--- a/modules/yangui-resources/src/main/resources/yangui/controllers/yangui.controller.js
+++ b/modules/yangui-resources/src/main/resources/yangui/controllers/yangui.controller.js
@@ -392,7 +392,8 @@ define(
                     $scope.selectedOperation = $scope.selSubApi.operations[0];
                 }
 
-                $scope.$broadcast('EV_DISABLE_ADDING_LIST_ELEMENT');
+                // TODO: uncomment this broadcast and check why does it cause adding element to list in operational portion twice
+                //$scope.$broadcast('EV_DISABLE_ADDING_LIST_ELEMENT');
 
                 $scope.$broadcast('EV_REFRESH_LIST_INDEX');
                 DesignUtilsService.triggerWindowResize(100);
@@ -437,17 +438,20 @@ define(
             reqString = reqPath ? reqPath.slice($scope.selApi.basePath.length, reqPath.length) : reqString;
             var requestPath = $scope.selApi.basePath + reqString;
 
-            $scope.node.buildRequest(RequestBuilderService, requestData, $scope.node.module);
-            angular.copy(requestData, preparedRequestData);
+            operation = YangUtilsService.prepareOperation(operation);
 
-            preparedRequestData = YangUtilsService.prepareRequestData(
-                preparedRequestData,
-                operation,
-                reqString,
-                $scope.selSubApi
-            );
+            if (operation !== 'REMOVE'){
+                $scope.node.buildRequest(RequestBuilderService, requestData, $scope.node.module);
+                angular.copy(requestData, preparedRequestData);
+
+                preparedRequestData = YangUtilsService.prepareRequestData(
+                    preparedRequestData,
+                    operation,
+                    reqString,
+                    $scope.selSubApi
+                );
+            }
 
-            operation = YangUtilsService.prepareOperation(operation);
             headers = YangUtilsService.prepareHeaders(preparedRequestData);
 
             requestWorkingCallback();
@@ -503,8 +507,8 @@ define(
 
                     if (resp.data && resp.data.errors && resp.data.errors.error && resp.data.errors.error.length) {
                         errorMsg = ': ' + resp.data.errors.error.map(function (e) {
-                            return e['error-message'];
-                        }).join(', ');
+                                return e['error-message'];
+                            }).join(', ');
                     }
 
                     requestErrorCallback(errorMsg, resp);