shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Attach labels instead of erroring on creation if label already exists

Browse Source 
If a label already exists, don't error out when trying to post to the
job_templates/n/labels endpoint, instad just lookup the ID and attach
it. This is primarily to benefit the UI, but in general seems like a
good behavior for this endpoint anyways.

 Fixes #2135
This commit is contained in:
Akita Noek 2016-06-10 11:53:52 -04:00
parent 74b6ea82fb
commit 175c010296
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/api/views.py
View File

@ -2497,6 +2497,18 @@ class JobTemplateLabelList(SubListCreateAttachDetachAPIView, DeleteLastUnattachL
parent_model = JobTemplate
relationship = 'labels'
def post(self, request, *args, **kwargs):
# If a label already exists in the database, attach it instead of erroring out
# that it already exists
if 'id' not in request.data and 'name' in request.data and 'organization' in request.data:
existing = Label.objects.filter(name=request.data['name'], organization_id=request.data['organization'])
if existing.exists():
existing = existing[0]
request.data['id'] = existing.id
del request.data['name']
del request.data['organization']
return super(JobTemplateLabelList, self).post(request, *args, **kwargs)
class JobTemplateCallback(GenericAPIView):
model = JobTemplate
@ -3815,7 +3827,6 @@ class RoleChildrenList(SubListAPIView):
# Create view functions for all of the class-based views to simplify inclusion
# in URL patterns and reverse URL lookups, converting CamelCase names to
# lowercase_with_underscore (e.g. MyView.as_view() becomes my_view).