From 118c1088a3274f701dd5cd446ee1772c5eb98606 Mon Sep 17 00:00:00 2001 From: Jan Evers Date: Thu, 6 Feb 2025 11:21:49 +0100 Subject: [PATCH] fix(Tinebase): Show correct year for week 1 in period picker --- tine20/Tinebase/js/ux/form/PeriodPicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tine20/Tinebase/js/ux/form/PeriodPicker.js b/tine20/Tinebase/js/ux/form/PeriodPicker.js index 2aaa67aeccc..55a154c963d 100644 --- a/tine20/Tinebase/js/ux/form/PeriodPicker.js +++ b/tine20/Tinebase/js/ux/form/PeriodPicker.js @@ -81,7 +81,7 @@ Ext.ux.form.PeriodPicker = Ext.extend(Ext.form.Field, { case 'week': // NOTE: '+1' is to ensure we display the ISO8601 based week where weeks always start on monday! const wkStart = this.startDate.add(Date.DAY, this.startDate.getDay() < 1 ? 1 : 0); - dateString = wkStart.getWeekOfYear() + ' - ' + this.startDate.format('Y'); + dateString = wkStart.getWeekOfYear() + ' - ' + (wkStart.getWeekOfYear() === 1 ? this.value.until.format('Y') : this.startDate.format('Y')) break; case 'month': dateString = Date.getShortMonthName(this.startDate.getMonth()) + ' ' + this.startDate.format('Y');