summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhangab <zhanganbing@chinamobile.com>2018-05-30 11:44:13 +0800
committerzhangab <zhanganbing@chinamobile.com>2018-05-30 11:44:20 +0800
commited95800538cd31cc60aa5ea055ec2d3939432607 (patch)
tree15beec4e0490390e669b45560961eefd1b1b1d67
parent704c19c2fef0beb4b0d19081fcb72b4d945eb257 (diff)
modify scale progress display
Change-Id: I4a6ef01b376b70d445a6786426d4cc9e6f28ee55 Issue-ID: USECASEUI-122 Signed-off-by: zhangab <zhanganbing@chinamobile.com>
-rw-r--r--usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/controller/ServiceTemplateService.js4
-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, 8 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 e15032de..9f813a36 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
@@ -381,6 +381,10 @@
// console.log('create response...');
console.log(response);
var operationId = response.data.operationId;
+ if(operationId == null){
+ console.log('error: operationId is null');
+ return false;
+ }
successFun( operationId);
});
},
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 a4b52941..73dc6edb 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
@@ -753,7 +753,9 @@ app.controller('lcmCtrl', ['$scope', '$uibModal', '$log', '$http', '$timeout', '
}
console.log('timer finished!');
} else if ('processing' === serviceProgress.result) {
- ctrl.dynamic = serviceProgress.progress;
+ if(serviceProgress.progress > ctrl.dynamic){
+ ctrl.dynamic = serviceProgress.progress;
+ }
ctrl.operation = serviceProgress.operationContent;
console.log('timer processing ......');
}
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 b6e15066..4f50651b 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
@@ -57,7 +57,7 @@
<td>
<button class="btn btn-primary" ng-click="ctrl.scaleService(serviceInstance)">Scale</button>
<button class="btn btn-primary" ng-click="ctrl.deleteService(serviceInstance)">Delete</button>
- <button class="btn btn-primary" ng-click="ctrl.upDateService(serviceInstance)">upDate</button>
+ <!-- <button class="btn btn-primary" ng-click="ctrl.upDateService(serviceInstance)">upDate</button> -->
</td>
</tr>
</tbody>