diff options
author | Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2018-05-21 17:57:35 +0300 |
---|---|---|
committer | Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2018-05-21 17:57:35 +0300 |
commit | 910d67051377e37a592f9db17a69c4e469f05369 (patch) | |
tree | be1841ea53cff085b01edbdba40bce8a2360775f /vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html | |
parent | ab845cb4fc3454e9bb5270eb11ebde289969c092 (diff) |
Scale out fixes
Change-Id: I7c0232f5e8e461616e1dfc2df2dd2c49b35eb71f
Issue-ID: VID-188
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
Diffstat (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html')
-rw-r--r-- | vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html index bf3579ea..6a47de0a 100644 --- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html +++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html @@ -106,9 +106,9 @@ <div>Invariant UUID</div> </div> - <div class="table-row" ng-repeat-start="vnf in vm.changeManagement.vnfNames" ng-if="vnf['prov-status'] === 'PROV'" ng-click="vnf.isOpen=!!!vnf.isOpen"> + <div class="table-row" ng-repeat-start="vnf in vm.changeManagement.vnfNames" ng-click="vnf.isOpen=!!!vnf.isOpen"> <div>+</div> - <div>{{vnf['service-instance-node'].properties['service-instance-name']}}</div> + <div>{{vnf['service-instance-node'][0].properties['service-instance-name']}}</div> <div>{{vnf.name}}</div> <div>{{vnf['availableVersions'][0].modelInfo.modelVersion}}</div> <div>{{vnf.category}}</div> @@ -127,10 +127,9 @@ <div class="table-row" ng-repeat="(custUUID, moduleArr) in vnf.groupModules"> <div>{{moduleArr[0].modelCustomizationName}}</div> <div>{{moduleArr.length}}</div> - <div ng-if="moduleArr[0].properties.minCountInstances == moduleArr[0].properties.maxCountInstances">N/A</div> - <div ng-if="moduleArr[0].properties.minCountInstances != moduleArr[0].properties.maxCountInstances"> - <input type="number" ng-model="moduleArr[0].scale" step="1" - ng-min="moduleArr[0].properties.minCountInstances" ng-max="moduleArr[0].properties.maxCountInstances - moduleArr.length" /> + <div ng-if="!(moduleArr[0].properties.maxCountInstances - moduleArr.length > 0)">N/A</div> + <div ng-if="moduleArr[0].properties.maxCountInstances - moduleArr.length > 0"> + <input type="checkbox" ng-model="moduleArr[0].scale" /> </div> <div>{{moduleArr[0].uuid}}</div> <div> @@ -142,10 +141,13 @@ </div> <div class="modal-footer"> + <div class="pull-left"> + <button ng-if="vm.wizardStep === 2" ng-click="vm.prevStep();" type="button" id="back" name="back" class="btn btn-primary">Back</button> + </div> <div class="pull-right"> + <button type="button" id="cancel" name="cancel" class="btn btn-white" ng-click="vm.close()">Cancel</button> <button ng-if="!vm.isScaleOut() || (vm.isScaleOut() && vm.wizardStep === 2)" type="submit" id="submit" name="submit" class="btn btn-primary" data-ng-disabled="newChangeManagement.$invalid">{{vm.hasScheduler ? "Schedule" : "Confirm"}}</button> <button ng-if="vm.isScaleOut() && vm.wizardStep === 1" ng-click="vm.nextStep();" type="button" id="next" name="next" class="btn btn-primary" data-ng-disabled="newChangeManagement.$invalid">Next</button> - <button type="button" id="cancel" name="cancel" class="btn btn-white" ng-click="vm.close()">Cancel</button> </div> </div> </form> |