Fix service template is empty.

Change-Id: I0d1d8dfe687e95de16429d7ff3ef5fdda8fc39e4
Issue-id: USECASEUI-36
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 bb55b6f..141c012 100644 (file)
--- 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 e2db747..3f67584 100644 (file)
--- 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) {