holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure there's an action_var, use 'action' if not set

Browse Source
This commit is contained in:
Nathan Gray 2013-02-05 09:34:54 +00:00
parent 162eb552af
commit 417b22e071
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.etemplate.inc.php
View File

@ -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 * @ToDo supported customized templates stored in DB, currently we only support xet files stored in filesystem
*/ */
class etemplate extends etemplate_old {}; //class etemplate extends etemplate_old {};
class etemplate_new extends etemplate_widget_template //class etemplate_new extends etemplate_widget_template
//class etemplate extends etemplate_widget_template class etemplate extends etemplate_widget_template
{ {
/** /**
* Are we running as sitemgr module or not * Are we running as sitemgr module or not

6
etemplate/js/et2_extension_nextmatch.js
View File

@ -155,6 +155,12 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput], {
if (entry) if (entry)
{ {
_attrs["settings"] = 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";
}
} }
} }
}, },