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

Merge pull request #2104 from YunfanZhang42/release_3.3.0

Browse Source 
Fix job id incorrectly cast to string in ActiveJobConflict.
This commit is contained in:
Yunfan Zhang
2018-06-08 09:53:06 -04:00
committed by GitHub
parent bcd9c5dada 0de369b42f
commit 1255cfc2f0
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/exceptions.py
View File

@@ -12,7 +12,11 @@ class ActiveJobConflict(ValidationError):
status_code = 409
def __init__(self, active_jobs):
super(ActiveJobConflict, self).__init__({
# During APIException.__init__(), Django Rest Framework
# turn everything in self.detail into string by using force_text.
# Declare detail afterwards circumvent this behavior.
super(ActiveJobConflict, self).__init__()
self.detail = {
"error": _("Resource is being used by running jobs."),
"active_jobs": active_jobs
})
}