External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

add trailing '/' to webhook urls

Browse Source
This commit is contained in:
Jake McDermott
2019-09-10 16:52:25 -04:00
committed by Jeff Bradberry
parent 41ba5c0968
commit 3bc91f123e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ export default
const newServiceValue = newValue && typeof newValue === 'object' ? newValue.value : newValue; const newServiceValue = newValue && typeof newValue === 'object' ? newValue.value : newValue;
const oldServiceValue = oldValue && typeof oldValue === 'object' ? oldValue.value : oldValue; const oldServiceValue = oldValue && typeof oldValue === 'object' ? oldValue.value : oldValue;
if (newServiceValue) { if (newServiceValue) {
$scope.webhook_url = `${$scope.callback_server_path}${jobTemplateData.url}${newServiceValue}`; $scope.webhook_url = `${$scope.callback_server_path}${jobTemplateData.url}${newServiceValue}/`;
} else { } else {
$scope.webhook_url = ''; $scope.webhook_url = '';
$scope.webhook_key = ''; $scope.webhook_key = '';

2
awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
View File

@@ -200,7 +200,7 @@ export default [
const newServiceValue = newValue && typeof newValue === 'object' ? newValue.value : newValue; const newServiceValue = newValue && typeof newValue === 'object' ? newValue.value : newValue;
const oldServiceValue = oldValue && typeof oldValue === 'object' ? oldValue.value : oldValue; const oldServiceValue = oldValue && typeof oldValue === 'object' ? oldValue.value : oldValue;
if (newServiceValue) { if (newServiceValue) {
$scope.webhook_url = `${$scope.baseURL}${workflowJobTemplateData.url}${newServiceValue}`; $scope.webhook_url = `${$scope.baseURL}${workflowJobTemplateData.url}${newServiceValue}/`;
$scope.enable_webhook = true; $scope.enable_webhook = true;
} else { } else {
$scope.webhook_url = ''; $scope.webhook_url = '';