From 7281ba419d0a05905e1ca080731854a438141115 Mon Sep 17 00:00:00 2001 From: seshukm Date: Tue, 25 Apr 2017 17:53:56 +0530 Subject: Res Mgr defect fix IssueId : CLIENT-200 Change-Id: I2f106ac9a7f253cd4fae6995986dbe6f59541fb3 Signed-off-by: seshukm --- resmgr/src/main/webapp/resmgr/index.html | 4 ++-- resmgr/src/main/webapp/resmgr/js/app.js | 15 +++++++++++++-- .../src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html | 2 +- .../main/webapp/resmgr/templates/templateContainer.html | 2 +- .../src/main/webapp/resmgr/templates/templateWidget.html | 16 ++++++++-------- 5 files changed, 25 insertions(+), 14 deletions(-) (limited to 'resmgr') diff --git a/resmgr/src/main/webapp/resmgr/index.html b/resmgr/src/main/webapp/resmgr/index.html index 36a6b17b..9572b117 100644 --- a/resmgr/src/main/webapp/resmgr/index.html +++ b/resmgr/src/main/webapp/resmgr/index.html @@ -1,4 +1,4 @@ - +--> diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js index 2ca5177b..1c06d8ac 100644 --- a/resmgr/src/main/webapp/resmgr/js/app.js +++ b/resmgr/src/main/webapp/resmgr/js/app.js @@ -198,6 +198,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) var portOperatingState = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"port.operState"}}; $('#myModal #operState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope)); + var neNativeId = {"ErrMsg" : {"errmsg" : "The nativeid required.", "modalVar":"port.nativeId"}}; + $('#myModal #nativeId').append($compile(Mustache.to_html(text, neNativeId.ErrMsg))($scope)); + $scope.checkboxes = { 'checked': false, items: {} }; $scope.portTableParams = new NgTableParams({count: 5, sorting: {name: 'asc'} //{page: 1,count: 10,filter: {name: 'M'},sorting: {name: 'desc'} @@ -292,6 +295,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $scope.numericErr = false; } $scope.saveData = function(id) { + $scope.port.edgePoint = $('#portEdropdown').val(); + $scope.port.type = $('#portdropdown').val(); + $scope.port.me = $('#medropdown').val(); if (!$scope.textboxErrName && !$scope.textboxErrMe) { var ports ={}; ports.logicalTerminationPoint=$scope.port; @@ -532,6 +538,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $scope.textboxErrName = false; } $scope.saveData = function(id) { + $scope.site.type = $('#sitedropdown').val(); if (!$scope.textboxErrName) { @@ -1040,6 +1047,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $scope.numericErr = false; } $scope.saveData = function(id) { + $scope.link.type = $('#linkdropdown').val(); if (!$scope.textboxErr) { var links ={} @@ -1214,9 +1222,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $('#myModal #controller').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/ - var dropdownResponse=[{"serviceTemplateId":"meCtrl","templateName":"mecontroller1"},{"serviceTemplateId":"meCtrl2","templateName":"mecontroller"}]; + /*var dropdownResponse=[{"serviceTemplateId":"meCtrl","templateName":"mecontroller1"},{"serviceTemplateId":"meCtrl2","templateName":"mecontroller"}]; var dropdownInfo = translateToDropdownInfo(dropdownResponse); - document.getElementById("medropdown").innerHTML = dropdownInfo; + document.getElementById("medropdown").innerHTML = dropdownInfo;*/ neDataService.getNECtrlDDList() @@ -1372,6 +1380,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $("#myModal").modal({}).draggable(); } $scope.saveData = function(id) { + $scope.ne.controller = $('#medropdown').val(); + $scope.ne.siteId = $('#siteIdDropdown').val(); + if (!$scope.textboxErrName && !$scope.textboxErrIP) { var nes = {}; diff --git a/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html b/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html index 2bde05b5..badaa021 100644 --- a/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html +++ b/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html @@ -50,7 +50,7 @@
-
+

diff --git a/resmgr/src/main/webapp/resmgr/templates/templateContainer.html b/resmgr/src/main/webapp/resmgr/templates/templateContainer.html index ef6f01c6..a1640acd 100644 --- a/resmgr/src/main/webapp/resmgr/templates/templateContainer.html +++ b/resmgr/src/main/webapp/resmgr/templates/templateContainer.html @@ -61,7 +61,7 @@ @@ -105,7 +105,7 @@ @@ -113,7 +113,7 @@ @@ -123,7 +123,7 @@
- {{#required}}*{{/required}} + {{#required}}*{{/required}} {{errmsg}}
@@ -131,7 +131,7 @@ @@ -139,7 +139,7 @@ @@ -180,7 +180,7 @@ @@ -196,7 +196,7 @@ -- cgit 1.2.3-korg