From 727453d4207f7ed171ff9aa668aba6f59c4574c9 Mon Sep 17 00:00:00 2001 From: Stanislav Jamrich Date: Wed, 16 Nov 2016 15:42:32 +0100 Subject: [PATCH] YangUI - quickfix operational list form Yangman - fix mountpoint disconnect Yangman - fix loading Yin schemas for mountpoints Change-Id: Iab7db6ebde074bffe5d5fe2fc5f0d7651d55da4f Signed-off-by: Stanislav Jamrich Signed-off-by: Daniel Malachovsky --- .../resources/yangutils/services/yin-parser.services.js | 4 ++-- .../yangman/services/plugins-unsetter.services.js | 7 +++---- .../resources/yangui/controllers/api/list.controller.js | 5 ----- .../main/resources/yangui/controllers/yangui.controller.js | 3 ++- 4 files changed, 7 insertions(+), 12 deletions(-) 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 c1f32d6c..3f2fe4de 100644 --- 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 347ae538..e861d1b7 100644 --- 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 4780fff2..42b00943 100644 --- 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 e004211c..751e4fb7 100644 --- 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); -- 2.36.6