From 81f06621619ae49312be71170ae96466addb9eaf Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 30 Apr 2019 13:35:58 -0400 Subject: [PATCH 1/2] remove job ask_ fields that reference JT --- awx/api/serializers.py | 33 ++----------------------- awx/main/models/jobs.py | 54 ----------------------------------------- 2 files changed, 2 insertions(+), 85 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 7c353a9ba5..d23066fdc2 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -3229,41 +3229,12 @@ class JobTemplateWithSpecSerializer(JobTemplateSerializer): class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer): passwords_needed_to_start = serializers.ReadOnlyField() - ask_diff_mode_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) - ask_variables_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) - ask_limit_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) - ask_skip_tags_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) - ask_tags_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) - ask_job_type_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) - ask_verbosity_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) - ask_inventory_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) - ask_credential_on_launch = serializers.BooleanField( - read_only=True, - help_text=_('This field has been deprecated and will be removed in a future release')) artifacts = serializers.SerializerMethodField() class Meta: model = Job - fields = ('*', 'job_template', 'passwords_needed_to_start', 'ask_diff_mode_on_launch', - 'ask_variables_on_launch', 'ask_limit_on_launch', 'ask_tags_on_launch', 'ask_skip_tags_on_launch', - 'ask_job_type_on_launch', 'ask_verbosity_on_launch', 'ask_inventory_on_launch', - 'ask_credential_on_launch', 'allow_simultaneous', 'artifacts', 'scm_revision', + fields = ('*', 'job_template', 'passwords_needed_to_start', + 'allow_simultaneous', 'artifacts', 'scm_revision', 'instance_group', 'diff_mode', 'job_slice_number', 'job_slice_count') def get_related(self, obj): diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 88b67a7d68..60b3c92132 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -613,60 +613,6 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana new_prompts['_eager_fields']['job_slice_count'] = self.job_slice_count return super(Job, self).copy_unified_job(**new_prompts) - @property - def ask_diff_mode_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_diff_mode_on_launch - return False - - @property - def ask_variables_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_variables_on_launch - return False - - @property - def ask_limit_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_limit_on_launch - return False - - @property - def ask_tags_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_tags_on_launch - return False - - @property - def ask_skip_tags_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_skip_tags_on_launch - return False - - @property - def ask_job_type_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_job_type_on_launch - return False - - @property - def ask_verbosity_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_verbosity_on_launch - return False - - @property - def ask_inventory_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_inventory_on_launch - return False - - @property - def ask_credential_on_launch(self): - if self.job_template is not None: - return self.job_template.ask_credential_on_launch - return False - def get_passwords_needed_to_start(self): return self.passwords_needed_to_start From 5f1aeb0f4eece7a56a222ca2f2ffbafb23a7d033 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 1 May 2019 13:39:25 -0400 Subject: [PATCH 2/2] remove ask_vars from job_start endpoint --- awx/api/views/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index c0554440a9..0c2c6208f5 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -3624,7 +3624,6 @@ class JobStart(GenericAPIView): ) if obj.can_start: data['passwords_needed_to_start'] = obj.passwords_needed_to_start - data['ask_variables_on_launch'] = obj.ask_variables_on_launch return Response(data) def post(self, request, *args, **kwargs):