diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index b753dd8ad1..cc1efb49e7 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -140,6 +140,7 @@ .Form-tab--disabled:hover { color: @btn-txt; background-color: @btn-bg; + cursor:not-allowed!important; } .Form-tabSection{ diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js index 561dc558b2..9eb8e5f955 100644 --- a/awx/ui/client/src/forms/Groups.js +++ b/awx/ui/client/src/forms/Groups.js @@ -327,6 +327,7 @@ export default if (GroupFormObject.related[itm].include === "NotificationsList") { GroupFormObject.related[itm] = NotificationsList; GroupFormObject.related[itm].generateList = true; + GroupFormObject.related[itm].disabled = "source === undefined"; } } return GroupFormObject; diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 8680d8d230..033c31d082 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -1499,11 +1499,10 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat for (itm in this.form.related) { collection = this.form.related[itm]; - html += "
" + (collection.title || collection.editTitle) + - "
\n"; + html += `
${(collection.title || collection.editTitle)}
`; } } else if(this.mode === "add"){ @@ -1517,7 +1516,6 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat "\n"; } } - html += "";//tabHolder }