diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php index 98aaf9f1d9..6489f44556 100644 --- a/etemplate/inc/class.nextmatch_widget.inc.php +++ b/etemplate/inc/class.nextmatch_widget.inc.php @@ -575,10 +575,14 @@ class nextmatch_widget * + 'submit' default action, sets nm[action], nm[selected] and nm[select_all] * + 'location' redirects / set location.href to 'url' attribute * + 'popup' opens popup with url given in 'url' attribute + * + 'egw_open' call egw_open with egw_open parameters separated by dash (eg. "edit-infolog") and selected id's + * + 'open_popup' open div styled as popup contained in current form and named action.id+'_popup' * - string 'url' url for location or popup * - string 'target' target for location or popup + * - string 'targetapp' appname for location and jdots template * - string 'width' for popup * - string 'height' for popup + * - string 'egw_open' dash-separated parameters for nm_action=egw_open, eg. "edit-infolog" * - string 'confirm' confirmation message * - string 'confirm_multiple' confirmation message for multiple selected, defaults to 'confirm' * diff --git a/etemplate/js/nextmatch_action.js b/etemplate/js/nextmatch_action.js index 7329cf3742..9451a3dc7e 100644 --- a/etemplate/js/nextmatch_action.js +++ b/etemplate/js/nextmatch_action.js @@ -166,7 +166,11 @@ function nm_action(_action, _senders) break; case 'location': - if(target) + if (typeof _action.data.targetapp != 'undefined') + { + top.egw_appWindowOpen(_action.data.targetapp, url); + } + else if(target) { window.open(url, target); }