From d2e668a6eb96406dd71e47007fb34bd9d66de161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 21 Oct 2017 10:41:12 +0200 Subject: [PATCH] Test current_view before using it get_events callback may be called by fullcalendar before the screen has set the current_view attribute. issue6852 review38871002 --- src/view/calendar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/view/calendar.js b/src/view/calendar.js index fab3f80c9a..bd2bccf59e 100644 --- a/src/view/calendar.js +++ b/src/view/calendar.js @@ -115,7 +115,8 @@ this.start = Sao.DateTime(start.utc()); this.end = Sao.DateTime(end.utc()); var prm = jQuery.when(); - if (this.screen.current_view.view_type != 'form') { + if (this.screen.current_view && + (this.screen.current_view.view_type != 'form')) { var search_string = this.screen.screen_container.get_text(); prm = this.screen.search_filter(search_string); }