extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 09:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Calendar - avoid errors from holidays if no country set

Browse Source
This commit is contained in:
nathangray 2017-10-04 09:21:16 -06:00
parent 3314ca2ea0
commit 5183aa2a19
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/js/et2_widget_view.js
View File

@ -431,7 +431,7 @@ var et2_calendar_view = (function(){ "use strict"; return et2_valueWidget.extend
this.drag_create.start = null; this.drag_create.start = null;
} }
this.drag_create.end = start; this.drag_create.end = start;
// Clear some stuff, if last time did not complete // Clear some stuff, if last time did not complete
if(this.drag_create.event) if(this.drag_create.event)
{ {
@ -485,7 +485,7 @@ var et2_calendar_view = (function(){ "use strict"; return et2_valueWidget.extend
this.drag_create.event._values_check(value); this.drag_create.event._values_check(value);
this.drag_create.event.doLoadingFinished(); this.drag_create.event.doLoadingFinished();
} }
}, },
_drag_update_event: function() _drag_update_event: function()
@ -516,7 +516,7 @@ var et2_calendar_view = (function(){ "use strict"; return et2_valueWidget.extend
{ {
end = {}; end = {};
} }
if(this.drag_create.start && end.date && if(this.drag_create.start && end.date &&
JSON.stringify(this.drag_create.start.date) !== JSON.stringify(end.date)) JSON.stringify(this.drag_create.start.date) !== JSON.stringify(end.date))
{ {
@ -533,7 +533,7 @@ var et2_calendar_view = (function(){ "use strict"; return et2_valueWidget.extend
start.setUTCHours(0); start.setUTCHours(0);
start.setUTCMinutes(0); start.setUTCMinutes(0);
options.start = start.toJSON(); options.start = start.toJSON();
var end = new Date(options.end); var end = new Date(options.end);
end.setUTCHours(23); end.setUTCHours(23);
end.setUTCMinutes(59); end.setUTCMinutes(59);
@ -633,7 +633,9 @@ jQuery.extend(et2_calendar_view,
{ {
// Loaded in an iframe or something // Loaded in an iframe or something
var view = egw.window.et2_calendar_view ? egw.window.et2_calendar_view : this; var view = egw.window.et2_calendar_view ? egw.window.et2_calendar_view : this;
if(!view) return {};
// No country selected causes error, so skip if it's missing
if(!view || !egw.preference('country','common')) return {};
var cache = view.holiday_cache[year]; var cache = view.holiday_cache[year];
if (typeof cache == 'undefined') if (typeof cache == 'undefined')