diff --git a/awx/api/serializers.py b/awx/api/serializers.py index d5bb2cfe6b..91474643db 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -615,7 +615,7 @@ class BaseSerializer(serializers.ModelSerializer, metaclass=BaseSerializerMetacl def validate(self, attrs): attrs = super(BaseSerializer, self).validate(attrs) try: - # Create/update a model instance and run it's full_clean() method to + # Create/update a model instance and run its full_clean() method to # do any validation implemented on the model class. exclusions = self.get_validation_exclusions(self.instance) obj = self.instance or self.Meta.model() @@ -3229,7 +3229,7 @@ class JobCreateScheduleSerializer(LabelsListMixin, BaseSerializer): ret['labels'] = self._summary_field_labels(config) return ret except JobLaunchConfig.DoesNotExist: - return {'all': _('Unknown, job may have been ran before launch configurations were saved.')} + return {'all': _('Unknown, job may have been run before launch configurations were saved.')} class AdHocCommandSerializer(UnifiedJobSerializer): diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index ce25fab7c0..072f0b447f 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -2406,9 +2406,8 @@ class JobTemplateLaunch(RetrieveAPIView): """ modern_data = data.copy() - id_fd = '{}_id'.format('inventory') - if 'inventory' not in modern_data and id_fd in modern_data: - modern_data['inventory'] = modern_data[id_fd] + if 'inventory' not in modern_data and 'inventory_id' in modern_data: + modern_data['inventory'] = modern_data['inventory_id'] # credential passwords were historically provided as top-level attributes if 'credential_passwords' not in modern_data: