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

AC-1040 Add back a few attributes for backwards-compatibility.

Browse Source
This commit is contained in:
Chris Church
2014-03-25 11:51:21 -04:00
parent 24b587c877
commit 3c04cc73b0
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
awx/api/serializers.py
View File

@@ -332,6 +332,8 @@ class ProjectSerializer(BaseSerializer):
playbooks = serializers.Field(source='playbooks', help_text='Array of playbooks available within this project.') playbooks = serializers.Field(source='playbooks', help_text='Array of playbooks available within this project.')
scm_delete_on_next_update = serializers.Field(source='scm_delete_on_next_update') scm_delete_on_next_update = serializers.Field(source='scm_delete_on_next_update')
last_update_failed = serializers.Field(source='last_update_failed')
last_updated = serializers.Field(source='last_updated')
class Meta: class Meta:
model = Project model = Project
@@ -339,8 +341,8 @@ class ProjectSerializer(BaseSerializer):
'scm_branch', 'scm_clean', 'scm_branch', 'scm_clean',
'scm_delete_on_update', 'scm_delete_on_next_update', 'scm_delete_on_update', 'scm_delete_on_next_update',
'scm_update_on_launch', 'credential', 'scm_update_on_launch', 'credential',
#'last_update_failed', 'status', 'last_updated') 'last_job_failed', 'status', 'last_job_run') +\
'last_job_failed', 'status', 'last_job_run') ('last_update_failed', 'last_updated',) # Backwards compatibility
def get_related(self, obj): def get_related(self, obj):
if obj is None: if obj is None:
@@ -357,17 +359,19 @@ class ProjectSerializer(BaseSerializer):
if obj.credential and obj.credential.active: if obj.credential and obj.credential.active:
res['credential'] = reverse('api:credential_detail', res['credential'] = reverse('api:credential_detail',
args=(obj.credential.pk,)) args=(obj.credential.pk,))
#if obj.current_update:
# res['current_update'] = reverse('api:project_update_detail',
#if obj.last_update:
# res['last_update'] = reverse('api:project_update_detail',
# args=(obj.last_update.pk,))
if obj.current_job: if obj.current_job:
res['current_job'] = reverse('api:project_update_detail', res['current_job'] = reverse('api:project_update_detail',
args=(obj.current_job.pk,)) args=(obj.current_job.pk,))
if obj.last_job: if obj.last_job:
res['last_job'] = reverse('api:project_update_detail', res['last_job'] = reverse('api:project_update_detail',
args=(obj.last_job.pk,)) args=(obj.last_job.pk,))
# Backwards compatibility.
if obj.current_update:
res['current_update'] = reverse('api:project_update_detail',
args=(obj.last_update.pk,))
if obj.last_update:
res['last_update'] = reverse('api:project_update_detail',
args=(obj.last_update.pk,))
return res return res
def validate_local_path(self, attrs, source): def validate_local_path(self, attrs, source):
@@ -694,15 +698,17 @@ class GroupVariableDataSerializer(BaseVariableDataSerializer):
class InventorySourceSerializer(BaseSerializer): class InventorySourceSerializer(BaseSerializer):
#source_password = serializers.WritableField(required=False, default='') #source_password = serializers.WritableField(required=False, default='')
last_update_failed = serializers.Field(source='last_update_failed')
last_updated = serializers.Field(source='last_updated')
class Meta: class Meta:
model = InventorySource model = InventorySource
fields = ('id', 'type', 'url', 'related', 'summary_fields', 'created', fields = ('id', 'type', 'url', 'related', 'summary_fields', 'created',
'modified', 'inventory', 'group', 'source', 'source_path', 'modified', 'inventory', 'group', 'source', 'source_path',
'source_vars', 'credential', 'source_regions', 'overwrite', 'source_vars', 'credential', 'source_regions', 'overwrite',
'overwrite_vars', 'update_on_launch', #'update_interval', 'overwrite_vars', 'update_on_launch', 'last_job_failed',
#'last_update_failed', 'status', 'last_updated') 'status', 'last_job_run') + \
'last_job_failed', 'status', 'last_job_run') ('last_update_failed', 'last_updated') # Backwards compatibility.
read_only_fields = ('inventory', 'group') read_only_fields = ('inventory', 'group')
def get_related(self, obj): def get_related(self, obj):
@@ -723,18 +729,19 @@ class InventorySourceSerializer(BaseSerializer):
if obj.credential and obj.credential.active: if obj.credential and obj.credential.active:
res['credential'] = reverse('api:credential_detail', res['credential'] = reverse('api:credential_detail',
args=(obj.credential.pk,)) args=(obj.credential.pk,))
#if obj.current_update:
# res['current_update'] = reverse('api:inventory_update_detail',
# args=(obj.current_update.pk,))
#if obj.last_update:
# res['last_update'] = reverse('api:inventory_update_detail',
# args=(obj.last_update.pk,))
if obj.current_job: if obj.current_job:
res['current_job'] = reverse('api:inventory_update_detail', res['current_job'] = reverse('api:inventory_update_detail',
args=(obj.current_job.pk,)) args=(obj.current_job.pk,))
if obj.last_job: if obj.last_job:
res['last_job'] = reverse('api:inventory_update_detail', res['last_job'] = reverse('api:inventory_update_detail',
args=(obj.last_job.pk,)) args=(obj.last_job.pk,))
# Backwards compatibility.
if obj.current_update:
res['current_update'] = reverse('api:inventory_update_detail',
args=(obj.current_update.pk,))
if obj.last_update:
res['last_update'] = reverse('api:inventory_update_detail',
args=(obj.last_update.pk,))
return res return res
def get_summary_fields(self, obj): def get_summary_fields(self, obj):