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

Revert "Handle the situation where a Job Template's inventory has been removed"

Browse Source 
This reverts commit 12201de3cb344b6caafeb112f7db7135b049821d.
This commit is contained in:
Matthew Jones
2015-01-07 20:02:55 -05:00
parent 932c276829
commit 9900b13953
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/serializers.py
View File

@@ -1348,16 +1348,13 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
if obj.survey_enabled and ('name' in obj.survey_spec and 'description' in obj.survey_spec): if obj.survey_enabled and ('name' in obj.survey_spec and 'description' in obj.survey_spec):
d['survey'] = dict(title=obj.survey_spec['name'], description=obj.survey_spec['description']) d['survey'] = dict(title=obj.survey_spec['name'], description=obj.survey_spec['description'])
request = self.context.get('request', None) request = self.context.get('request', None)
if request is not None and request.user is not None and obj.inventory is not None and obj.project is not None: if request is not None and request.user is not None:
d['can_copy'] = request.user.can_access(JobTemplate, 'add', d['can_copy'] = request.user.can_access(JobTemplate, 'add',
{'inventory': obj.inventory.pk, {'inventory': obj.inventory.pk,
'project': obj.project.pk}) 'project': obj.project.pk})
d['can_edit'] = request.user.can_access(JobTemplate, 'change', obj, d['can_edit'] = request.user.can_access(JobTemplate, 'change', obj,
{'inventory': obj.inventory.pk, {'inventory': obj.inventory.pk,
'project': obj.project.pk}) 'project': obj.project.pk})
elif request.user is not None and request.user.is_superuser:
d['can_copy'] = True
d['can_edit'] = True
else: else:
d['can_copy'] = False d['can_copy'] = False
d['can_edit'] = False d['can_edit'] = False