aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2020-01-12 12:07:47 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-12 12:07:47 +0000
commit860899da8b3e43085c131cc848d35ea50d6c52ed (patch)
tree59b438402e56c97ad4150380f5b8193981454e55
parente66288d09a895a4c722198840b77e79999821ca4 (diff)
parent36518376539e5d79fe979fd50c80e0d08b090f53 (diff)
Merge "rename from hasTemplates to isInstantiationTemplateExists in browse SDC"
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js2
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js2
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js8
3 files changed, 6 insertions, 6 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
index 1b6457308..a540d162a 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -163,7 +163,7 @@
viewPerPage: $scope.viewPerPage,
currentPage: $scope.currentPage
};
- DataService.setHasTemplate(service.hasTemplate);
+ DataService.setIsInstantiationTemplateExists(service.isInstantiationTemplateExists);
sessionStorage.setItem("searchKey",JSON.stringify(searchKey));
console.log("Instantiating SDC service " + service.uuid);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
index 002bcb95a..91d805bdf 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
@@ -93,7 +93,7 @@ var creationDialogController = function (COMPONENT, FIELD, PARAMETER, $scope, $h
if (!$scope.shouldShowOldPopup()) {
- if(DataService.getHasTemplate()){
+ if(DataService.getIsInstantiationTemplateExists()){
$scope.url = COMPONENT.INSTANTIATION_TEMPLATES_IFRAME_URL + request.modelNameVersionId;
window.addEventListener("message", receiveMessage, false);
}else {
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
index 10c4277ca..1e539ac0a 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
@@ -320,11 +320,11 @@ var DataService = function($log, DataService) {
setOwningEntityProperties: function (properties) {
_this.owningEntityProperties = properties;
},
- getHasTemplate: function () {
- return _this.hasTemplate;
+ getIsInstantiationTemplateExists: function () {
+ return _this.isInstantiationTemplateExists;
},
- setHasTemplate: function (hasTemplate) {
- _this.hasTemplate = hasTemplate;
+ setIsInstantiationTemplateExists: function (isInstantiationTemplateExists) {
+ _this.isInstantiationTemplateExists = isInstantiationTemplateExists;
}
};
};