diff options
| author |   Tao Shen <shentao@chinamobile.com> | 2017-11-14 00:48:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-14 00:48:49 +0000 |
| commit | 05c280ba974ead95e29d367a21ab781a1cfb657e (patch) | |
| tree | e378ffdf98bd0ab8dec0291c452bdc28e59bbaa3 /usecaseui-lcm | |
| parent | ca5773b60f804bb7543f569419e12dacf59f020c (diff) | |
| parent | 286bfde41731dbfba5328406fd72cabe43e54860 (diff) | |
Merge "Fix location name issue."
Diffstat (limited to 'usecaseui-lcm')
3 files changed, 14 insertions, 4 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 9482597d..79e62c02 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 @@ -319,9 +319,9 @@ }); }, - queryVfOnboardProgress: function (jobId, progressFun) { + queryVfOnboardProgress: function (jobId, responseId, progressFun) { return $http({ - url: url+'/jobs/' + jobId, + url: url+'/jobs/' + jobId + '?responseId=' + responseId, 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 0a23df92..8917f60d 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 @@ -382,6 +382,7 @@ function ($uibModalInstance, ServiceTemplateService, jobId, operationTitle, $q, var timerDeferred = $q.defer(); var timerPromise = timerDeferred.promise; + var responseId = '0'; var progressFun = function (responseDescriptor) { if('finished' === responseDescriptor.status || 'error' === responseDescriptor.status) { ctrl.dynamic = 100; @@ -396,11 +397,17 @@ function ($uibModalInstance, ServiceTemplateService, jobId, operationTitle, $q, ctrl.dynamic = responseDescriptor.progress; ctrl.operation = responseDescriptor.statusDescription; console.log('timer processing ......'); + responseId = responseDescriptor.responseId; + if(responseId === undefined) { + console.log('Cannot get responseId...'); + $uibModalInstance.close(''); + timerDeferred.resolve(); + } } }; var timer = $interval(function () { - ServiceTemplateService.queryVfOnboardProgress(jobId, progressFun); + ServiceTemplateService.queryVfOnboardProgress(jobId, responseId, progressFun); }, 1000); timerPromise.then(function () { diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html index 295bcfd0..263656f5 100644 --- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html +++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html @@ -91,7 +91,10 @@ </div> </div> --> <div ng-repeat="segment_parameter in segment.parameters" class="mT15 form-group" style="margin-left:0px;"> - <label class="col-sm-5 control-label"> + <label ng-if="segment_parameter.type === 'vf_location'" class="col-sm-5 control-label"> + <span>{{segment_parameter.description}}</span><span ng-if="segment_parameter.isRequired" class="required">*</span> + </label> + <label ng-if="segment_parameter.type !== 'vf_location'" class="col-sm-5 control-label"> <span>{{segment_parameter.name}}</span><span ng-if="segment_parameter.isRequired" class="required">*</span> </label> <div ng-if="segment_parameter.type === 'string' || segment_parameter.type === 'boolean' || segment_parameter.type === 'integer'" class="col-sm-5"> |