From 26027657f8d16762a91dda610bb50162c751c3df Mon Sep 17 00:00:00 2001 From: Luji7 Date: Wed, 18 Oct 2017 15:02:59 +0800 Subject: Fix service template is empty. Change-Id: I0d1d8dfe687e95de16429d7ff3ef5fdda8fc39e4 Issue-id: USECASEUI-36 Signed-off-by: Luji7 --- .../app/uui/fusion/scripts/controller/ServiceTemplateService.js | 4 ++-- .../main/webapp/app/uui/fusion/scripts/controller/lcmController.js | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'usecaseui-lcm/src/main/webapp/app/uui/fusion') 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 bb55b6f7..141c012f 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, method: 'GET', data: null, headers: uuiHeaders @@ -98,7 +98,7 @@ getTemplateParameters: function (template, processFun) { return $http({ - url: url+'/service-templates/' + template.id, + url: url+'/service-templates/' + template.id+'?toscaModelPath='+ template.toscaModelURL, 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 e2db747a..3f67584d 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 @@ -110,7 +110,9 @@ app.controller('lcmCtrl', ['$scope', '$uibModal', '$log', '$http', '$timeout', ' function($scope, $uibModalInstance, ServiceTemplateService, customer, serviceType) { var ctrl = this; - ctrl.templates = ServiceTemplateService.getAllServiceTemplates(); + ctrl.templates = ServiceTemplateService.getAllServiceTemplates(function (t) { + ctrl.templates = t; + }); ctrl.changeInput = function (serviceTemplate) { var paras = serviceTemplate.inputs.map(function (input) { -- cgit 1.2.3-korg