From 1ce17f4656dfed650922190b133af44158976827 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Wed, 8 Jun 2016 16:02:54 -0600
Subject: [PATCH] Better handle reloads from framework to avoid double toolbar
 and bad display

---
 calendar/js/app.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 8173d05eb5..0132fe9113 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -366,6 +366,15 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
 			delete q.ajax;
 			delete q.menuaction;
 			if(!view && q.view || q.view != view && view == 'index') view = q.view;
+			
+			// No specific view requested, looks like a reload from framework
+			if(this.sidebox_et2 && typeof view === 'undefined')
+			{
+				this._clear_cache();
+				this.setState({state: this.state});
+				return false;
+			}
+
 			if (this.sidebox_et2 && typeof app.classes.calendar.views[view] == 'undefined' && view != 'index')
 			{
 				if(q.owner)