From f1a69e93579fff4a350e6536371fc408e3522b43 Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Wed, 14 Aug 2019 06:58:36 +0000 Subject: [PATCH] Fixed "DEFAULT ANSWER" to be properly deleted for Integer and Float types - Fixed issue ansible/tower#3639 Signed-off-by: Hideki Saito --- .../src/templates/survey-maker/surveys/init.factory.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js index 60ba73d401..19319c4ce9 100644 --- a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js +++ b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js @@ -381,10 +381,14 @@ export default } else if (scope.type.type === 'password') { data.default = scope.default_password; } else if (scope.type.type === 'multiselect') { - data.default = scope.default_multiselect; - } else if (scope.type.type === 'float') { + data.default = scope.default_multiselect; + } else if (scope.type.type === 'float' && + scope.default_float !== '' && + scope.default_float !== null) { data.default = scope.default_float; - } else if (scope.type.type === 'integer') { + } else if (scope.type.type === 'integer' && + scope.default_int !== '' && + scope.default_int !== null) { data.default = scope.default_int; } else { data.default = "";