External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Jake McDermott
2019-09-05 16:50:36 -04:00
committed by Jeff Bradberry
parent 151de89c26
commit 48eb502161
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@@ -430,6 +430,14 @@ export default
default_val: dft
});
const defaultWebhookKey = ($scope.webhook_key === "" || $scope.webhook_key === null) ? false : true;
hashSetup({
scope: $scope,
master: master,
check_field: 'enable_webhooks',
default_val: defaultWebhookKey
});
ParseTypeChange({
scope: $scope,
field_id: 'extra_vars',

34
awx/ui/client/src/templates/job_templates/job-template.form.js
View File

@@ -338,6 +338,17 @@ function(NotificationsList, i18n) {
dataTitle: i18n._('Allow Provisioning Callbacks'),
dataContainer: "body",
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
}, {
name: 'enable_webhooks',
label: i18n._('Enable Webhook'),
type: 'checkbox',
ngChange: "toggleCallback('webhook_key')",
column: 2,
awPopOver: "<p>" + i18n._("Enabled webhook for this job template.") + "</p>",
dataPlacement: 'right',
dataTitle: i18n._('Enable Webhook'),
dataContainer: "body",
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
}, {
name: 'allow_simultaneous',
label: i18n._('Enable Concurrent Jobs'),
@@ -396,7 +407,7 @@ function(NotificationsList, i18n) {
type:'select',
defaultText: i18n._('Choose a Webhook Service'),
ngOptions: 'svc.label for svc in webhook_service_options track by svc.value',
ngShow: true,
ngShow: "enable_webhooks && enable_webhooks !== 'false'",
ngDisabled: "!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate) || !canGetAllRelatedResources",
id: 'webhook-service-select',
required: false,
@@ -409,8 +420,7 @@ function(NotificationsList, i18n) {
webhook_url: {
label: i18n._('Webhook URL'),
type: 'text',
readonly: true,
//ngShow: "allow_webhooks && allow_webhooks !== 'false'",
ngShow: "enable_webhooks && enable_webhooks !== 'false'",
column: 2,
awPopOver: "webhook_url_help",
awPopOverWatch: "webhook_url_help",
@@ -419,9 +429,27 @@ function(NotificationsList, i18n) {
dataContainer: "body",
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
},
webhook_key: {
label: i18n._('Webhook Key'),
type: 'text',
ngShow: "enable_webhooks && enable_webhooks !== 'false'",
genHash: true,
column: 2,
awPopOver: "webhook_key_help",
awPopOverWatch: "webhook_key_help",
dataPlacement: 'right',
dataTitle: i18n._("Webhook Config Key"),
dataContainer: "body",
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)',
awRequiredWhen: {
reqExpression: 'enable_webhooks',
alwaysShowAsterisk: true
}
},
webhook_credential: {
label: i18n._('Webhook Credential'),
type: 'custom',
ngShow: "enable_webhooks && enable_webhooks !== 'false'",
control: `
<webhook-credential-input
is-field-disabled="!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate) || !(webhookCredential.modalBaseParams.credential_type__namespace)"