From 98e5291bfc458b0e96df885e61fdbb42a8e3d935 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 15 Jun 2016 14:45:47 -0700 Subject: [PATCH 1/2] Disabling notifications related button for manual groups --- awx/ui/client/src/forms/Groups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js index 06d717e532..85f5644df9 100644 --- a/awx/ui/client/src/forms/Groups.js +++ b/awx/ui/client/src/forms/Groups.js @@ -352,7 +352,7 @@ export default if (GroupFormObject.related[itm].include === "NotificationsList") { GroupFormObject.related[itm] = NotificationsList; GroupFormObject.related[itm].generateList = true; - GroupFormObject.related[itm].disabled = "source === undefined"; + GroupFormObject.related[itm].disabled = "source === undefined || source.value === ''"; } } return GroupFormObject; From 95e500d47250d064ad0e9d972264afa4fbd1379c Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 16 Jun 2016 13:52:31 -0700 Subject: [PATCH 2/2] the disabled key for the manual-inv-group-notifications was getting added to the notifications object for all notifications-related-lists --- awx/ui/client/src/forms/Groups.js | 2 +- awx/ui/client/src/shared/form-generator.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js index 85f5644df9..123fccd354 100644 --- a/awx/ui/client/src/forms/Groups.js +++ b/awx/ui/client/src/forms/Groups.js @@ -350,7 +350,7 @@ export default for (itm in GroupFormObject.related) { if (GroupFormObject.related[itm].include === "NotificationsList") { - GroupFormObject.related[itm] = NotificationsList; + GroupFormObject.related[itm] = angular.copy(NotificationsList); GroupFormObject.related[itm].generateList = true; GroupFormObject.related[itm].disabled = "source === undefined || source.value === ''"; } diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 9e14e28d32..35b291c848 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -1519,7 +1519,11 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += `
${(collection.title || collection.editTitle)}
`; + `ng-class="{'is-selected': ${itm}Selected ` ; + if(this.form.related[itm].disabled){ + html += `, 'Form-tab--disabled' : ${this.form.related[itm].disabled }`; + } + html += `}">${(collection.title || collection.editTitle)}`; } } else if(this.mode === "add"){