(js) Allow single-day vacation autoreply

Fixes #4698
Alinto · Oct 1, 2019 · 9326953 · 9326953
1 parent 6b96f2f
commit 9326953
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -22,6 +22,7 @@ Bug fixes
  - [web] properly encode URL of cards from exteral sources
  - [web] restore cards selection after automatic refresh (#4809)
  - [web] don't mark draft as deleted when SOGoMailKeepDraftsAfterSend is enabled (#4830)
+ - [web] allow single-day vacation auto-reply (#4698)
  - [core] honor IMAPLoginFieldName also when setting IMAP ACLs
  - [core] honor groups when setting IMAP ACLs
  - [core] honor "any authenticated user" when setting IMAP ACLs

diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -500,7 +500,7 @@
           d.Vacation.enabled) {
         if (d.Vacation.startDateEnabled) {
           r = (!d.Vacation.endDateEnabled ||
-               date.getTime() < d.Vacation.endDate.getTime()) &&
+               date.getTime() <= d.Vacation.endDate.getTime()) &&
             date.getTime() >= today.getTime();
         }
       }
@@ -515,7 +515,7 @@
           d.Vacation.enabled) {
         if (d.Vacation.endDateEnabled) {
           r = (!d.Vacation.startDateEnabled ||
-               date.getTime() > d.Vacation.startDate.getTime()) &&
+               date.getTime() >= d.Vacation.startDate.getTime()) &&
             date.getTime() >= today.getTime();
         }
       }