From c75d386dde8da29a126b786581f2c4f61ba51f74 Mon Sep 17 00:00:00 2001
From: seshukm <seshu.kumar.m@huawei.com>
Date: Mon, 3 Apr 2017 20:35:31 +0530
Subject: Service mgr bug fix

IssueID : CLIENT-189

Change-Id: I8ccec0cc92a0e94a3ce9a644150296497d7a09a6
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
---
 resmgr/src/main/webapp/resmgr/js/app.js            | 46 ++++++++++++++++------
 .../resmgr/nfv-resmgr/datacenter/datacenter.html   |  4 +-
 .../resmgr/nfv-resmgr/location/location.html       |  4 +-
 .../main/webapp/resmgr/sdn-resmgr/link/link.html   |  4 +-
 .../src/main/webapp/resmgr/sdn-resmgr/ne/ne.html   |  4 +-
 .../main/webapp/resmgr/sdn-resmgr/port/port.html   |  4 +-
 .../main/webapp/resmgr/sdn-resmgr/site/site.html   |  4 +-
 7 files changed, 45 insertions(+), 25 deletions(-)

(limited to 'resmgr')

diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index 271041f9..d3a351c3 100644
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -262,10 +262,13 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }
         $scope.saveData = function(id) {
             if (!$scope.textboxErrName && $scope.textboxErrMe) {
+				var ports ={};
+				ports.port=$scope.port;
                 if(id) {
+					
                     //edit data
                     console.log("Editing data.." + JSON.stringify($scope.port));
-                    portDataService.editPortData($scope.port)
+                    portDataService.editPortData(ports)
                         .then(function (data) {
                             $scope.message = "Success :-)";
                             $state.reload();
@@ -276,7 +279,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 }
                 else {
                     console.log("Adding data.." + JSON.stringify($scope.port));
-                    portDataService.addPortData($scope.port)
+                    portDataService.addPortData(ports)
                         .then(function (data) {
                             $scope.message = "Success :-)";
                             $state.reload();
@@ -721,10 +724,15 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }
         $scope.saveData = function(id) {
             if (!$scope.textboxErrLocation && !$scope.textboxErrCountry && !$scope.textboxErrLatitude && !$scope.textboxErrLongitude) {
+				
+				var locs = {}
+					locs.loc = $scope.loc
                 if(id) {
+					
+					
                     //edit data
                     console.log("Editing data.." + JSON.stringify($scope.loc));
-                    locationDataService.editLocationData($scope.loc)
+                    locationDataService.editLocationData(locs)
                         .then(function (data) {
                             $scope.message = "Success :-)";
                             $state.reload();
@@ -735,7 +743,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 }
                 else {
                     console.log("Adding data.." + JSON.stringify($scope.loc));
-                    locationDataService.addLocationData($scope.loc)
+                    locationDataService.addLocationData(locs)
                         .then(function (data) {
 
                             $scope.message = "Success :-)";
@@ -961,10 +969,16 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }
         $scope.saveData = function(id) {
             if (!$scope.textboxErr) {
+				
+			var links ={}
+			links.link= $scope.link;
+				
                 if(id) {
+					
+
                     //edit data
                     console.log("Editing data.." + JSON.stringify($scope.link));
-                    linkDataService.editLinkData($scope.link)
+                    linkDataService.editLinkData(links)
                         .then(function (data) {
                             $scope.message = "Success :-)";
                             $state.reload();
@@ -974,8 +988,8 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                         });
                 }
                 else {
-                    console.log("Adding data.." + JSON.stringify($scope.link));
-                    linkDataService.addLinkData($scope.link)
+                    console.log("Adding data.." + JSON.stringify(links));
+                    linkDataService.addLinkData(links)
                         .then(function (data) {
 
                             $scope.message = "Success :-)";
@@ -1192,10 +1206,13 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }
         $scope.saveData = function(id) {
             if (!$scope.textboxErrName && !$scope.textboxErrVersion) {
+				
+				var nes = {};
+				nes.ne = $scope.ne;
                 if(id) {
                     //edit data
-                    console.log("Editing data.." + JSON.stringify($scope.ne));
-                    neDataService.editNEData($scope.ne)
+                    console.log("Editing data.." + JSON.stringify(nes));
+                    neDataService.editNEData(nes)
                         .then(function (data) {
                             $scope.message = "Success :-)";
                             $state.reload();
@@ -1206,7 +1223,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 }
                 else {
                     console.log("Adding data.." + JSON.stringify($scope.ne));
-                    neDataService.addNEData($scope.ne)
+                    neDataService.addNEData(nes)
                         .then(function (data) {
 
                             $scope.message = "Success :-)";
@@ -1433,10 +1450,13 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
         }
         $scope.saveData = function(id) {
             if (!$scope.textboxErr && !$scope.numericErr) {
+				
+				var dcs = {}
+				dcs.dc =	$scope.datacenter;
                 if(id) {
                     //edit data
-                    console.log("Editing data.." + JSON.stringify($scope.datacenter));
-                    datacenterDataService.editDatacenterData($scope.datacenter)
+                    console.log("Editing data.." + JSON.stringify(dcs));
+                    datacenterDataService.editDatacenterData(dcs)
                         .then(function (data) {
                             $scope.message = "Success :-)";
                             $state.reload();
@@ -1447,7 +1467,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
                 }
                 else {
                     console.log("Adding data.." + JSON.stringify($scope.datacenter));
-                    datacenterDataService.addDatacenterData($scope.datacenter)
+                    datacenterDataService.addDatacenterData(dcs)
                         .then(function (data) {
 
                             $scope.message = "Success :-)";
diff --git a/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html b/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
index 91a1c191..cd0c2c38 100644
--- a/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
+++ b/resmgr/src/main/webapp/resmgr/nfv-resmgr/datacenter/datacenter.html
@@ -55,8 +55,8 @@
             {{datacenterData.HardDisk}}
         </td>
         <td title="'Action'">
-            <span  ng-click="editData(datacenterData.Id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>
-            <span  ng-click="deleteData(datacenterData.Id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>
+            <span  ng-click="editData(datacenterData.Id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>
+            <span  ng-click="deleteData(datacenterData.Id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
         </td>
     </tr>
 </table>
diff --git a/resmgr/src/main/webapp/resmgr/nfv-resmgr/location/location.html b/resmgr/src/main/webapp/resmgr/nfv-resmgr/location/location.html
index 22e18134..f153a497 100644
--- a/resmgr/src/main/webapp/resmgr/nfv-resmgr/location/location.html
+++ b/resmgr/src/main/webapp/resmgr/nfv-resmgr/location/location.html
@@ -47,8 +47,8 @@
         <td title="'Action'">
             <!--<span class="pull-right glyphicon glyphicon-edit" ng-click="editData(locationData.Id)" style="cursor: pointer;margin: 0 5px"></span>
             <span class="pull-right glyphicon glyphicon-trash" ng-click="deleteData(locationData.Id)" style="cursor: pointer;margin: 0 5px"></span>-->
-            <span  ng-click="editData(locationData.Id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>
-            <span  ng-click="deleteData(locationData.Id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>
+            <span  ng-click="editData(locationData.Id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>
+            <span  ng-click="deleteData(locationData.Id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
         </td>
     </tr>
 </table>
diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
index 4acae5dc..e28abfcd 100644
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/link/link.html
@@ -55,10 +55,10 @@
             {{linkData.operatingState}}
         <td title="'Action'">
         <!-- <span class="pull-right glyphicon glyphicon-edit" ng-click="editData(siteData.name)" style="cursor: pointer;margin: 0 5px"></span>-->
-        <span  ng-click="editData(linkData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>
+        <span  ng-click="editData(linkData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>
 
         <!--<span class="pull-right glyphicon glyphicon-trash" ng-click="deleteIndividualData(siteData.id)" style="cursor: pointer;margin: 0 5px"></span>-->
-        <span  ng-click="deleteData(linkData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>
+        <span  ng-click="deleteData(linkData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
 
     </td>
     </tr>
diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
index 12eeb97b..45f5da33 100644
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/ne/ne.html
@@ -55,8 +55,8 @@
             {{neData.operState}}
         </td>
         <td title="'Action'">
-            <span  ng-click="editData(neData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>
-            <span  ng-click="deleteData(neData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>
+            <span  ng-click="editData(neData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>
+            <span  ng-click="deleteData(neData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
 
         </td>
     </tr>
diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
index 31f48b46..09cf3a6c 100644
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/port/port.html
@@ -56,8 +56,8 @@
             {{portData.operState}}
         </td>
         <td title="'Action'">
-            <span  ng-click="editData(portData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>
-            <span  ng-click="deleteData(portData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>
+            <span  ng-click="editData(portData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>
+            <span  ng-click="deleteData(portData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
 
         </td>
     </tr>
diff --git a/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
index 15357996..fb250664 100644
--- a/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
+++ b/resmgr/src/main/webapp/resmgr/sdn-resmgr/site/site.html
@@ -46,8 +46,8 @@
             {{siteData.location}}
         </td>
         <td title="'Action'">
-            <span  ng-click="editData(siteData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>
-            <span  ng-click="deleteData(siteData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>
+            <span  ng-click="editData(siteData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>
+            <span  ng-click="deleteData(siteData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>
 
 
         </td>
-- 
cgit 1.2.3-korg