From 7f41f16509880595cdb183f6a490e9b292cb5737 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 7 Nov 2016 15:36:57 -0500
Subject: [PATCH] passwords in WFJT surveys working correctly

---
 awx/main/models/mixins.py   | 3 +++
 awx/main/models/workflow.py | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/awx/main/models/mixins.py b/awx/main/models/mixins.py
index 39675cae7c..2dcc7befef 100644
--- a/awx/main/models/mixins.py
+++ b/awx/main/models/mixins.py
@@ -1,3 +1,6 @@
+# Python
+import json
+
 # Django
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py
index f22694ca94..b24a0dc563 100644
--- a/awx/main/models/workflow.py
+++ b/awx/main/models/workflow.py
@@ -232,12 +232,15 @@ class WorkflowJobNode(WorkflowNodeBase):
         if aa_dict:
             self.ancestor_artifacts = aa_dict
             self.save(update_fields=['ancestor_artifacts'])
+        password_dict = {}
         if '_ansible_no_log' in aa_dict:
-            # TODO: merge Workflow Job survey passwords into this
-            password_dict = {}
             for key in aa_dict:
                 if key != '_ansible_no_log':
                     password_dict[key] = REPLACE_STR
+        workflow_job_survey_passwords = self.workflow_job.survey_passwords
+        if workflow_job_survey_passwords:
+            password_dict.update(workflow_job_survey_passwords)
+        if password_dict:
             data['survey_passwords'] = password_dict
         # process extra_vars
         # TODO: still lack consensus about variable precedence