From: Luji7 <lu.ji3@zte.com.cn>
Date: Tue, 24 Oct 2017 09:10:09 +0000 (+0800)
Subject: Fix no response for deleting service.
X-Git-Tag: v1.1.0~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F20311%2F1;p=usecase-ui.git

Fix no response for deleting service.

Change-Id: I3724e6fc2225b09ffbad2283420f4dae20647c69
Issue-id: USECASEUI-53
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
---

diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js
index 4f18a547..bf1d8c23 100644
--- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js
@@ -58,7 +58,7 @@
 
      getServiceInstances: function (customerId, serviceType, processFun) {
        return $http({
-         url: url+'/service-instances?customerId='+customerId+'&serviceType='+serviceType,
+         url: url+'/service-instances?customerId='+customerId+'&serviceType='+serviceType.value,
          method: 'GET',
          data: null,
          headers: uuiHeaders
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
index 95ee1ada..3bfb72e5 100644
--- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js
@@ -78,6 +78,10 @@ app.controller('lcmCtrl', ['$scope', '$uibModal', '$log', '$http', '$timeout', '
         });
       };
 
+      ctrl.deleteService = function (serviceInstance) {
+        ServiceTemplateService.deleteService(serviceInstance.serviceInstanceId);
+      };
+
       ctrl.packageOnboard = function (onboardPackage) {
         var modalInstance = $uibModal.open({
           ariaLabelledBy: 'modal-title',
diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html
index b6fadfc8..0f3c5759 100644
--- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html
@@ -53,7 +53,7 @@
                 <td>{{serviceInstance.serviceInstanceId}}</td>
                 <td>{{serviceInstance.serviceInstanceName}}</td>
                 <td>{{serviceInstance.serviceType}}</td>
-                <td><a href="#" class="btn btn-primary">Delete</a></td>
+                <td><button class="btn btn-primary" ng-click="ctrl.deleteService(serviceInstance)">Delete</button></td>
               </tr>
             </tbody>
           </table>