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

Merge pull request #1649 from chrismeyersfsu/fix-label_alpha

Browse Source 
order tags alphabetically
This commit is contained in:
Chris Meyers
2016-04-22 12:34:41 -04:00
parent 8f9fe93de5 b8a22c2c17
commit bab627d973
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -1624,7 +1624,7 @@ class JobOptionsSerializer(BaseSerializer):
return res return res
def _summary_field_labels(self, obj): def _summary_field_labels(self, obj):
return [{'id': x.id, 'name': x.name} for x in obj.labels.all().order_by('-name')[:10]] return [{'id': x.id, 'name': x.name} for x in obj.labels.all().order_by('name')[:10]]
def get_summary_fields(self, obj): def get_summary_fields(self, obj):
res = super(JobOptionsSerializer, self).get_summary_fields(obj) res = super(JobOptionsSerializer, self).get_summary_fields(obj)

2
awx/main/tests/unit/api/test_serializers.py
View File

@@ -146,7 +146,7 @@ class TestJobOptionsSerializerGetSummaryFields(GetSummaryFieldsMixin):
serializer = JobOptionsSerializer() serializer = JobOptionsSerializer()
summary_labels = serializer._summary_field_labels(job_template) summary_labels = serializer._summary_field_labels(job_template)
job_template.labels.all.order_by.assert_called_with('-name') job_template.labels.all.order_by.assert_called_with('name')
assert len(summary_labels) == 10 assert len(summary_labels) == 10
assert summary_labels == [{'id': x.id, 'name': x.name} for x in labels[:10]] assert summary_labels == [{'id': x.id, 'name': x.name} for x in labels[:10]]