From 417b22e071c5e924cca1585ac24d298142472157 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 5 Feb 2013 09:34:54 +0000 Subject: [PATCH] Make sure there's an action_var, use 'action' if not set --- etemplate/inc/class.etemplate.inc.php | 6 +++--- etemplate/js/et2_extension_nextmatch.js | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php index d5a2dffa84..bc68b9a612 100644 --- a/etemplate/inc/class.etemplate.inc.php +++ b/etemplate/inc/class.etemplate.inc.php @@ -35,9 +35,9 @@ if (!isset($GLOBALS['egw_info'])) * * @ToDo supported customized templates stored in DB, currently we only support xet files stored in filesystem */ -class etemplate extends etemplate_old {}; -class etemplate_new extends etemplate_widget_template -//class etemplate extends etemplate_widget_template +//class etemplate extends etemplate_old {}; +//class etemplate_new extends etemplate_widget_template +class etemplate extends etemplate_widget_template { /** * Are we running as sitemgr module or not diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js index f827f8cb5b..5217b9751d 100644 --- a/etemplate/js/et2_extension_nextmatch.js +++ b/etemplate/js/et2_extension_nextmatch.js @@ -155,6 +155,12 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput], { if (entry) { _attrs["settings"] = entry; + + // Make sure there's an action var parameter + if(_attrs["settings"]["actions"] && !_attrs.settings["action_var"]) + { + _attrs.settings.action_var = "action"; + } } } },