External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-19 08:50:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into expunge-zeromq-unstable

Browse Source 
Conflicts:
	setup/roles/awx_install/tasks/main.yml
This commit is contained in:
Luke Sneeringer
2014-10-31 15:10:10 -05:00
parent f000e71371 89f34f6a2e
commit 5e4e61dcda
13 changed files with 692 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/serializers.py
View File

@@ -1257,9 +1257,14 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
d = super(JobTemplateSerializer, self).get_summary_fields(obj)
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'])
request = self.context.get('request', None)
if request is not None and request.user is not None:
d['can_copy'] = request.user.can_access(JobTemplate, 'add', {'inventory': obj.inventory,
'project': obj.project})
else:
d['can_copy'] = False
return d
class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
passwords_needed_to_start = serializers.Field(source='passwords_needed_to_start')