From 6958fb457a0d7a6534d222cc5b3ba11115a47d52 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 22 Apr 2016 14:56:54 -0400 Subject: [PATCH 1/2] display of ask_ vars on job model --- awx/main/models/jobs.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index c48007e24a..98409a7148 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -523,6 +523,30 @@ class Job(UnifiedJob, JobOptions): 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_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_inventory_on_launch(self): + if self.job_template is not None: + return self.job_template.ask_inventory_on_launch + return False + def get_passwords_needed_to_start(self): return self.passwords_needed_to_start From 5e05859c20a52bc01c27e81fdea478a8edb19ecb Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 22 Apr 2016 15:04:16 -0400 Subject: [PATCH 2/2] add credential to job ask_ properties --- awx/api/serializers.py | 3 ++- awx/main/models/jobs.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 07f33002aa..d7f97a7a79 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1733,12 +1733,13 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer): ask_tags_on_launch = serializers.ReadOnlyField() ask_job_type_on_launch = serializers.ReadOnlyField() ask_inventory_on_launch = serializers.ReadOnlyField() + ask_credential_on_launch = serializers.ReadOnlyField() class Meta: model = Job fields = ('*', 'job_template', 'passwords_needed_to_start', 'ask_variables_on_launch', 'ask_limit_on_launch', 'ask_tags_on_launch', 'ask_job_type_on_launch', - 'ask_inventory_on_launch') + 'ask_inventory_on_launch', 'ask_credential_on_launch') def get_related(self, obj): res = super(JobSerializer, self).get_related(obj) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 98409a7148..a0ec791ab9 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -547,6 +547,12 @@ class Job(UnifiedJob, JobOptions): 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