From 60b7309c08b66e09112a0ff5eb163446ea38eb1d Mon Sep 17 00:00:00 2001
From: jangsutsr <jangsutsr@gmail.com>
Date: Mon, 22 Aug 2016 16:33:03 -0400
Subject: [PATCH] Resolve extra vars display mix-up with passworded survey
 questions.

---
 awx/main/models/jobs.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index c233269ce9..5df339186b 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -746,9 +746,14 @@ class Job(UnifiedJob, JobOptions):
         Hides fields marked as passwords in survey.
         '''
         if self.survey_passwords:
-            extra_vars = json.loads(self.extra_vars)
-            extra_vars.update(self.survey_passwords)
-            return json.dumps(extra_vars)
+            try:
+                extra_vars = json.loads(self.extra_vars)
+                for key, value in self.survey_passwords.items():
+                    if key in extra_vars:
+                        extra_vars[key] = value
+                return json.dumps(extra_vars)
+            except ValueError:
+                pass
         else:
             return self.extra_vars