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

Merge pull request #4729 from mabashian/4690-delete-wfjt-survey

Browse Source 
Fixed bug that was preventing wfjt survey deletion
This commit is contained in:
Michael Abashian
2017-01-13 18:15:28 -05:00
committed by GitHub
parent 46941dab5d 05c3f5fbea
commit 839db07d9a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/templates/survey-maker/surveys/delete.factory.js
View File

@@ -13,6 +13,7 @@ export default
var scope = params.scope, var scope = params.scope,
id = params.id, id = params.id,
templateType = params.templateType,
url; url;
@@ -35,7 +36,8 @@ export default
scope.$emit("SurveyDeleted"); scope.$emit("SurveyDeleted");
} else { } else {
url = GetBasePath('job_templates')+ id + '/survey_spec/'; let basePath = templateType === 'workflow_job_template' ? GetBasePath('workflow_job_templates') : GetBasePath('job_templates');
url = basePath + id + '/survey_spec/';
Rest.setUrl(url); Rest.setUrl(url);
Rest.destroy() Rest.destroy()

3
awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
View File

@@ -52,7 +52,8 @@ export default
// and closing the modal after success // and closing the modal after success
DeleteSurvey({ DeleteSurvey({
scope: scope, scope: scope,
id: id id: id,
templateType: templateType
}); });
}; };