aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuji7 <lu.ji3@zte.com.cn>2017-10-24 17:10:09 +0800
committerLuji7 <lu.ji3@zte.com.cn>2017-10-24 17:10:15 +0800
commit79d3d38db36a938d7b3ae95cd6943cb36d8826fa (patch)
treec3e9bed954db5ef2dc96c6144f593eba8a28e6cb
parenteccd508e64bc3004bc2f1d963feaa3ae88e4e663 (diff)
Fix no response for deleting service.
Change-Id: I3724e6fc2225b09ffbad2283420f4dae20647c69 Issue-id: USECASEUI-53 Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
-rw-r--r--usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js2
-rw-r--r--usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js4
-rw-r--r--usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/lifecyclemanagement.html2
3 files changed, 6 insertions, 2 deletions
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>