From ac13ef0005d5178932c98a8b967703a65a37d87e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 19 May 2016 17:24:47 -0400 Subject: [PATCH] (js) Fix month view when spawning six weeks Fixes #3663 --- NEWS | 1 + UI/WebServerResources/js/Scheduler/Component.service.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index bdd9543567..c3a310d738 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ Bug fixes - [web] fixed creation of chip on blur (sgTransformOnBlur directive) - [web] fixed composition of new messages from Contacts module - [web] fixed autocompletion of LDAP-based groups (#3673) + - [web] fixed month view when current month covers six weeks (#3663) 3.1.0 (2016-05-18) ------------------ diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js index 714fc4407e..098fab7824 100644 --- a/UI/WebServerResources/js/Scheduler/Component.service.js +++ b/UI/WebServerResources/js/Scheduler/Component.service.js @@ -263,7 +263,7 @@ startDate.setDate(1); startDate = startDate.beginOfWeek(firstDayOfWeek); endDate = new Date(); - endDate.setTime(startDate.getTime()); + endDate.setTime(date.getTime()); endDate.setMonth(endDate.getMonth() + 1); endDate.addDays(-1); endDate = endDate.endOfWeek(firstDayOfWeek);