From fddf292d47cf54ade6e75082a1bda8097c57b72d Mon Sep 17 00:00:00 2001 From: John Westcott IV Date: Fri, 10 Jun 2022 10:25:14 -0400 Subject: [PATCH] Additional changes from review --- awx/api/serializers.py | 2 +- awx/api/views/__init__.py | 3 +-- awx/main/models/schedules.py | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 9c36d30259..8bd722ce95 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -4683,7 +4683,7 @@ class ScheduleSerializer(LaunchConfigurationBaseSerializer, SchedulePreviewSeria timezone = serializers.SerializerMethodField( help_text=_( - 'The timezone this schedule runs in. This field is extracted from the RRULE. If the timezone in the RRULE is a link to another timezone this field will show the links name.' + 'The timezone this schedule runs in. This field is extracted from the RRULE. If the timezone in the RRULE is a link to another timezone, the link will be reflected in this field.' ), ) until = serializers.SerializerMethodField( diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index fa858f7808..54dc24617b 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -578,8 +578,7 @@ class ScheduleZoneInfo(APIView): swagger_topic = 'System Configuration' def get(self, request): - zone_info = models.Schedule.get_zoneinfo_with_links() - return Response(zone_info) + return Response({'zones': models.Schedule.get_zoneinfo(), 'links': models.Schedule.get_zoneinfo_links()}) class LaunchConfigCredentialsBase(SubListAttachDetachAPIView): diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py index 8feee8f9d2..29d43ec98d 100644 --- a/awx/main/models/schedules.py +++ b/awx/main/models/schedules.py @@ -85,16 +85,16 @@ class Schedule(PrimordialModel, LaunchTimeConfig): next_run = models.DateTimeField(null=True, default=None, editable=False, help_text=_("The next time that the scheduled action will run.")) @classmethod - def get_zoneinfo(self): + def get_zoneinfo(cls): return sorted(get_zonefile_instance().zones) @classmethod - def get_zoneinfo_with_links(self): + def get_zoneinfo_links(cls): + return_val = {} zone_instance = get_zonefile_instance() - return_val = {'zones': sorted(zone_instance.zones), 'links': {}} - for zone_name in return_val['zones']: + for zone_name in zone_instance.zones: if str(zone_name) != str(zone_instance.zones[zone_name]._filename): - return_val['links'][zone_name] = zone_instance.zones[zone_name]._filename + return_val[zone_name] = zone_instance.zones[zone_name]._filename return return_val @property