aboutsummaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/main
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-10-10 08:22:51 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-10 08:22:51 +0000
commit012975b2349ba5cc7c8434195b59459b8b0a0e89 (patch)
treecaca5468c57dcd183cb92cb101c9fb12796bb592 /vid-app-common/src/main
parente02ffbb580a3a8049baae4437871129d6e37c91a (diff)
parent4c8c2ac1d29e19d1cb935749af0d1c0063d5c0fd (diff)
Merge changes from topics "VID-30", "VID-37"
* changes: Add the "@Override" annotation. Replace "==" with "===".
Diffstat (limited to 'vid-app-common/src/main')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/model/VNFDao.java1
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js2
2 files changed, 2 insertions, 1 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 = {};