From d934145909d7973395c70b568980a5200b632b37 Mon Sep 17 00:00:00 2001
From: Harpreet Kataria <hkataria@redhat.com>
Date: Wed, 4 Sep 2019 15:00:12 -0400
Subject: [PATCH] Merge pull request #414 from himdel/fix412

dialog-user: Move tagging fix from #412 to setDefaultValue
(cherry picked from commit b224a5079f8e86de77e8ebc7c5cdace16b993355)

https://bugzilla.redhat.com/show_bug.cgi?id=1749061
---
 src/dialog-user/components/dialog-user/dialogField.ts | 7 -------
 src/dialog-user/services/dialogData.ts                | 5 +++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/dialog-user/components/dialog-user/dialogField.ts b/src/dialog-user/components/dialog-user/dialogField.ts
index dd7d013084..9247f7157e 100644
--- a/src/dialog-user/components/dialog-user/dialogField.ts
+++ b/src/dialog-user/components/dialog-user/dialogField.ts
@@ -50,13 +50,6 @@ export class DialogFieldController {
     this.clonedDialogField = _.cloneDeep(this.field);
     this.dialogField = this.service.setupField(this.field);
 
-    if (this.dialogField.type === 'DialogFieldTagControl') {
-      // if not set already, setting the default_value on <None>
-      if (typeof this.dialogField.default_value === 'undefined') {
-        this.dialogField.default_value = 0;
-      }
-    }
-
     if ((this.dialogField.type === 'DialogFieldDateTimeControl') ||
         (this.dialogField.type === 'DialogFieldDateControl')) {
       this.setMinDate();
diff --git a/src/dialog-user/services/dialogData.ts b/src/dialog-user/services/dialogData.ts
index 6947596edc..b83ef6ae98 100644
--- a/src/dialog-user/services/dialogData.ts
+++ b/src/dialog-user/services/dialogData.ts
@@ -128,6 +128,11 @@ export default class DialogDataService {
         defaultOption.id = 0;
         defaultValue = defaultOption.id;
       }
+
+      // if not set already, setting the default_value on <None>
+      if (defaultValue === undefined) {
+        defaultValue = 0;
+      }
     }
 
     return defaultValue;