diff options
Diffstat (limited to 'vid-app-common/src/main')
3 files changed, 4 insertions, 3 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java b/vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java index 8370f91e1..cb7a0fcc6 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java @@ -41,6 +41,7 @@ public class VNFDao extends DomainVo { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "VNF_DB_ID") @JsonIgnore + @Override public Long getId() { return id; } diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js index b3afcd864..6d8dde844 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js @@ -35,7 +35,7 @@ $scope.properties = UtilityService.getProperties();
$scope.resumeStatus = COMPONENT.RESUME_STATUS;
//isPermitted - returned as string from url and converted into boolean
- $scope.isPermitted = $location.search().isPermitted == "true";
+ $scope.isPermitted = $location.search().isPermitted === "true";
$scope.STATUS_CONSTANTS = FIELD.STATUS;
$scope.pnfs = [];// PNF data init;
$scope.collectionResource = {};
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 3f2489dbb..d3cb239e6 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 @@ -82,10 +82,10 @@ <select name="cloudRegion" class="form-control" ng-model="vm.changeManagement.cloudRegion" data-tests-id="cloudRegion" id="cloudRegion" data-ng-disabled="newChangeManagement.serviceType.$pristine"> <option value="" >select cloud Region</option> - <option ng-repeat="option in cloudRegionList" value="{{option.tenantId}}" + <option ng-repeat="option in cloudRegionList" value="{{option.cloudRegionId}}" data-ng-if="option.isPermitted && !isFeatureFlagCloudOwner">{{option.cloudRegionId}} </option> - <option ng-repeat="option in cloudRegionList" value="{{option.tenantId}}" + <option ng-repeat="option in cloudRegionList" value="{{option.cloudRegionId}}" data-ng-if="option.isPermitted && isFeatureFlagCloudOwner"> {{option.cloudRegionId}} ({{removeVendorFromCloudOwner(option.cloudOwner).toUpperCase()}}) </option> |