YangUI - quickfix operational list form

Yangman - fix mountpoint disconnect
Yangman - fix loading Yin schemas for mountpoints

Change-Id: Iab7db6ebde074bffe5d5fe2fc5f0d7651d55da4f
Signed-off-by: Stanislav Jamrich <sjamrich@cisco.com>
Signed-off-by: Daniel Malachovsky <dmalacho@cisco.com>

diff --git a/modules/common-yangutils-resources/src/main/resources/yangutils/services/yin-parser.services.js b/modules/common-yangutils-resources/src/main/resources/yangutils/services/yin-parser.services.js
index c1f32d6c87332a32f4bfd7852379fb7702d10212..3f2fe4deecc6e35243fb3ba276b810550fbb4bb6 100644 (file)
--- a/modules/common-yangutils-resources/src/main/resources/yangutils/services/yin-parser.services.js
+++ b/modules/common-yangutils-resources/src/main/resources/yangutils/services/yin-parser.services.js
@@ -27,8 +27,8 @@ define([], function () {
 
             YangUiApisService.getSingleModuleInfo(path)
                 .then(function (data) {
-                    if ($.parseXML(data) !== null) {
-                        parseModule(data, callback);
+                    if ($.parseXML(data.data) !== null) {
+                        parseModule(data.data, callback);
                     } else {
                         loadStaticModule(name, callback, errorCbk);
                     }

diff --git a/modules/yangman-resources/src/main/resources/yangman/services/plugins-unsetter.services.js b/modules/yangman-resources/src/main/resources/yangman/services/plugins-unsetter.services.js
index 347ae5386105a54a993d7d8341a858d28681b74b..e861d1b7878481f242c5ec515a843b6340dce2cb 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/services/plugins-unsetter.services.js
+++ b/modules/yangman-resources/src/main/resources/yangman/services/plugins-unsetter.services.js
@@ -1,12 +1,11 @@
 define(['angular'], function (angular) {
     'use strict';
 
-    angular.module('app.yangman').service('PluginsUnsetterService',
-        ['PathUtilsService', 'DataBackupService', PluginsUnsetterService]);
+    angular.module('app.yangman').service('PluginsUnsetterService', PluginsUnsetterService);
 
-    PluginsUnsetterService.$inject = ['constants'];
+    PluginsUnsetterService.$inject = ['DataBackupService', 'constants'];
 
-    function PluginsUnsetterService(PathUtilsService, DataBackupService, constants){
+    function PluginsUnsetterService(DataBackupService, constants){
         var service = {
             'YANGMAN_CUST_MOUNT_POINTS': unsetMountPoint,
             unset: unset,

diff --git a/modules/yangui-resources/src/main/resources/yangui/controllers/api/list.controller.js b/modules/yangui-resources/src/main/resources/yangui/controllers/api/list.controller.js
index 4780fff22a8e816e4b90de23b36cee09ff7b222e..42b00943eb65dcc9e5ccbe70ab076d0eb3ea6f37 100644 (file)
--- a/modules/yangui-resources/src/main/resources/yangui/controllers/api/list.controller.js
+++ b/modules/yangui-resources/src/main/resources/yangui/controllers/api/list.controller.js
@@ -51,15 +51,10 @@ define([], function () {
             }
         };
 
-
         function toggleExpandedAugModal(){
             $scope.augModalView = !$scope.augModalView;
         }
 
-        $scope.$on('EV_DISABLE_ADDING_LIST_ELEMENT', function() {
-            $scope.init();
-        });
-
         function refreshListIndex() {
             $scope.currentDisplayIndex = 1;
         }

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 e004211cfbf58947c2fe9c55a982675ca305d2b0..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);