From ed95800538cd31cc60aa5ea055ec2d3939432607 Mon Sep 17 00:00:00 2001
From: zhangab <zhanganbing@chinamobile.com>
Date: Wed, 30 May 2018 11:44:13 +0800
Subject: modify scale progress display

Change-Id: I4a6ef01b376b70d445a6786426d4cc9e6f28ee55
Issue-ID: USECASEUI-122
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
---
 .../app/uui/fusion/scripts/controller/ServiceTemplateService.js       | 4 ++++
 .../main/webapp/app/uui/fusion/scripts/controller/lcmController.js    | 4 +++-
 .../app/uui/fusion/scripts/view-models/lifecyclemanagement.html       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'usecaseui-lcm/src/main/webapp')

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>
-- 
cgit 1.2.3-korg