diff options
Diffstat (limited to 'usecaseui-lcm/src/main/webapp/app/uui/fusion')
| -rw-r--r-- | usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js | 4 | ||||
| -rw-r--r-- | usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/lcmController.js | 4 |
2 files changed, 5 insertions, 3 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 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) { |