diff options
| author |   Amichai Hemli <ah0398@intl.att.com> | 2017-09-15 06:31:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-15 06:31:52 +0000 |
| commit | 344ba457188c9935ab316456ffc54b18e6fdc812 (patch) | |
| tree | 3c3e8dd72cdcedb98b61a1ebe29997bbef8b9abd /vid-app-common/src/main | |
| parent | 138adfa2ca115e3929964abd998df02c3318d58e (diff) | |
| parent | 7f848fd111de13778e3d88ff6839ed2ccafd46e4 (diff) | |
Merge "Fix for VID Service Type drop down"
Diffstat (limited to 'vid-app-common/src/main')
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js | 3 | ||||
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js index 65e15f27..03ec788b 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js @@ -398,7 +398,8 @@ appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) { id : ID.SUBSCRIBER_NAME,
type : PARAMETER.SELECT,
prompt : PROMPT.SUBSCRIBER_NAME,
- isRequired : true
+ isRequired : true,
+ isSingleOptionAutoSelected : false
},
TENANT_DISABLED : {
name : NAME.TENANT,
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js b/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js index b6a360f4..69a0ae52 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js @@ -247,7 +247,7 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService) { }
if (UtilityService.hasContents(parameter.prompt)) {
- if (!(IS_SINGLE_OPTION_AUTO_SELECTED && parameter.optionList.length === 1)) {
+ if (!(IS_SINGLE_OPTION_AUTO_SELECTED && parameter.optionList.length === 1) || !(parameter.isSingleOptionAutoSelected && parameter.optionList.length === 1)) {
html += "<option value=''>" + parameter.prompt + "</option>";
}
}
|