From e5707929986075d9b260d530cda1355bcc2d9435 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Wed, 2 Aug 2017 12:01:27 -0400 Subject: [PATCH] Prevent default text from getting pushed to dropdown options --- .../inventories/related/sources/sources.form.js | 1 + awx/ui/client/src/shared/Utilities.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js index 302dd8135e..0e69d07fa7 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js @@ -109,6 +109,7 @@ return { inventory_file: { label: i18n._('Inventory File'), type:'select', + defaultText: 'Choose an inventory file', ngOptions: 'file for file in inventory_files track by file', ngShow: "source && source.value === 'scm'", ngDisabled: "!(inventory_source_obj.summary_fields.user_capabilities.edit || canAdd) || disableInventoryFileBecausePermissionDenied", diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js index a79f46a076..507d0b7ec4 100644 --- a/awx/ui/client/src/shared/Utilities.js +++ b/awx/ui/client/src/shared/Utilities.js @@ -659,6 +659,9 @@ angular.module('Utilities', ['RestServices', 'Utilities']) $(element).on('select2:select', (e) => { scope[model] = e.params.data.text; scope[selectOptions] = _.cloneDeep(original_options); + if (e.params.data.id === "") { + return; + } if (scope[selectOptions].indexOf(e.params.data.text) === -1) { scope[selectOptions].push(e.params.data.text); }