extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle special egw-open param for nextmatch action when from=merge is involved (params meet different preconditions then)

Browse Source
This commit is contained in:
Klaus Leithoff 2014-03-24 08:23:22 +00:00
parent 05857ba73b
commit 94ff3e1966
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etemplate/js/et2_extension_nextmatch_actions.js
View File

@ -123,11 +123,22 @@ function nm_action(_action, _senders, _target, _ids)
}
else
{
// Discard
params.shift(params[2]);
// Discard , special handling when from=merge is involved
if(params.length>1 && params[0]=='' && params[1].indexOf('from=merge')!=-1)
{
params.shift();
}
else
{
params.shift(params[2]);
}
}
}
//special handling when from=merge is involved
if(params.length>1 && params[0]=='' && params[1].indexOf('from=merge')!=-1)
{
params.shift();
}
// Re-join, in case extra has a -
var extra = params.join('-');
egw(app,window).open(egw_open_id,app,type,extra,target);