From 711c240baf1a8419bc8f92552db7aeee0802fef5 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 5 Sep 2019 15:28:53 -0400 Subject: [PATCH] Consistently give WJ extra_vars as text --- awx/main/models/jobs.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 058ef87515..0fc9a95d68 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -896,22 +896,6 @@ class LaunchTimeConfigBase(BaseModel): data[prompt_name] = prompt_val return data - def display_extra_vars(self): - ''' - Hides fields marked as passwords in survey. - ''' - if hasattr(self, 'survey_passwords') and self.survey_passwords: - extra_vars = parse_yaml_or_json(self.extra_vars).copy() - for key, value in self.survey_passwords.items(): - if key in extra_vars: - extra_vars[key] = value - return extra_vars - else: - return self.extra_vars - - def display_extra_data(self): - return self.display_extra_vars() - for field_name in JobTemplate.get_ask_mapping().keys(): if field_name == 'extra_vars': @@ -954,6 +938,22 @@ class LaunchTimeConfig(LaunchTimeConfigBase): def extra_vars(self, extra_vars): self.extra_data = extra_vars + def display_extra_vars(self): + ''' + Hides fields marked as passwords in survey. + ''' + if hasattr(self, 'survey_passwords') and self.survey_passwords: + extra_vars = parse_yaml_or_json(self.extra_vars).copy() + for key, value in self.survey_passwords.items(): + if key in extra_vars: + extra_vars[key] = value + return extra_vars + else: + return self.extra_vars + + def display_extra_data(self): + return self.display_extra_vars() + class JobLaunchConfig(LaunchTimeConfig): '''