From 374312be3c44bc0112e954e5b8198ced383a4793 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 13 Dec 2013 01:15:41 +0000 Subject: [PATCH] need to set app_header before message, as app_header is (temp.) replaced by it --- etemplate/js/etemplate2.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js index 6f487437b6d..b3febba70d4 100644 --- a/etemplate/js/etemplate2.js +++ b/etemplate/js/etemplate2.js @@ -250,7 +250,10 @@ etemplate2.prototype.load = function(_name, _url, _data, _callback) if(_data) { this.etemplate_exec_id = _data.etemplate_exec_id; // set app_header - window.egw_app_header(_data.app_header); + if (typeof _data.app_header == 'string') + { + window.egw_app_header(_data.app_header); + } } var _load = function() { @@ -686,10 +689,17 @@ function etemplate2_handle_load(_type, _response) } } - // handle egw_framework::message() - if (jQuery.isArray(data['message'])) + // need to set app_header before message, as message temp. replaces app_header + if (typeof data.data.app_header == 'string') { - window.egw_message.apply(window, data['message']); + window.egw_app_header(data.data.app_header); + delete data.data.app_header; + } + + // handle egw_framework::message() + if (jQuery.isArray(data.message)) + { + window.egw_message.apply(window, data.message); } // handle egw_framework::window_close(), this will terminate execution