extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar - Fix js error reading holiday event preference

Browse Source
This commit is contained in:
nathangray 2019-06-19 09:19:01 -06:00
parent c7f31ab815
commit afdee4b2eb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/js/et2_widget_daycol.js
View File

@ -418,7 +418,15 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
// Holidays and birthdays // Holidays and birthdays
var holidays = et2_calendar_view.get_holidays(this,this.options.date.substring(0,4)); var holidays = et2_calendar_view.get_holidays(this,this.options.date.substring(0,4));
var holiday_list = []; var holiday_list = [];
var holiday_pref = (egw.preference('birthdays_as_events','calendar')||'').split(','); var holiday_pref = (egw.preference('birthdays_as_events','calendar')||[]);
if(typeof holiday_pref === 'string')
{
holiday_pref = holiday_pref.split(',');
}
else
{
holiday_pref = jQuery.extend([], holiday_pref);
}
// Show holidays as events on mobile or by preference // Show holidays as events on mobile or by preference
var holidays_as_events = egwIsMobile() || egw.preference('birthdays_as_events','calendar') === true || var holidays_as_events = egwIsMobile() || egw.preference('birthdays_as_events','calendar') === true ||