From 9c3c0773149d1bb1ca4c86dd9ce2a196e01ef081 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 12 Dec 2013 23:32:30 +0000 Subject: [PATCH] fixed not updated sidebox in calendar listview --- etemplate/inc/class.etemplate.inc.php | 2 +- etemplate/js/etemplate2.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php index bf4869cb1b..8caf434300 100644 --- a/etemplate/inc/class.etemplate.inc.php +++ b/etemplate/inc/class.etemplate.inc.php @@ -197,7 +197,7 @@ class etemplate_new extends etemplate_widget_template { //error_log("Ajax " . __LINE__); $GLOBALS['egw']->framework->response->generic("data", array('
')); - $GLOBALS['egw']->framework->response->generic('et2_load',$load_array); + $GLOBALS['egw']->framework->response->generic('et2_load',$load_array+egw_framework::get_extra()); self::$request = null; return; } diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js index 706f3f0bc4..ac098facba 100644 --- a/etemplate/js/etemplate2.js +++ b/etemplate/js/etemplate2.js @@ -708,9 +708,9 @@ function etemplate2_handle_load(_type, _response) } // handle framework.setSidebox calls - if (window.framework && jQuery.isArray(data['setSidebox'])) + if (window.framework && jQuery.isArray(data.setSidebox)) { - window.framework.setSidebox.apply(window, JSON.parse(data['setSidebox'])); + window.framework.setSidebox.apply(window.framework, data.setSidebox); } // regular et2 re-load