From 9926653faaf25a38e184561674b2b96f87a980c8 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 9 Dec 2015 14:06:07 -0500
Subject: [PATCH] (fix) improve default vacation preferences handling

---
 UI/Templates/PreferencesUI/UIxPreferences.wox    |  1 +
 .../js/Preferences/Preferences.service.js        | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 16fe2e31a..1c40b1f62 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -756,6 +756,7 @@
                 <md-input-container>
                   <label><var:string label:value="Email addresses (separated by commas)"/></label>
                   <textarea const:name="autoReplyEmailAddresses"
+                            required="required"
                             const:id="autoReplyEmailAddresses"
                             ng-model="app.preferences.defaults.Vacation.autoReplyEmailAddresses"/>
                 </md-input-container>
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 3c1aa9079..266ed1a40 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -33,11 +33,21 @@
           data.Vacation.endDateEnabled = 0;
           data.Vacation.endDate = new Date();
         }
-
-        if (data.Vacation.autoReplyEmailAddresses)
+        if (data.Vacation.autoReplyEmailAddresses && data.Vacation.autoReplyEmailAddresses.length)
           data.Vacation.autoReplyEmailAddresses = data.Vacation.autoReplyEmailAddresses.join(",");
-      } else {
+        else
+          delete data.Vacation.autoReplyEmailAddresses;
+      } else
         data.Vacation = {};
+
+      if (!angular.isDefined(data.Vacation.autoReplyEmailAddresses) &&
+          angular.isDefined(window.defaultEmailAddresses))
+        data.Vacation.autoReplyEmailAddresses = window.defaultEmailAddresses;
+
+      if (!angular.isDefined(data.Vacation.daysBetweenResponse))
+        data.Vacation.daysBetweenResponse = 7;
+
+      if (!angular.isDefined(data.Vacation.endDate)) {
         data.Vacation.endDateEnabled = 0;
         data.Vacation.endDate = new Date();
       }