extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-01 00:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix document merge using sidebox while in list view gave "application echoed something" instead of document

Browse Source
This commit is contained in:
Nathan Gray 2015-10-05 16:55:42 +00:00
parent a3035a57d5
commit c5cff22c59
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/app.js
View File

@ -214,6 +214,14 @@ app.classes.calendar = AppJS.extend(
return _url.replace(/menuaction=[^&]+/, 'menuaction=calendar.calendar_uilist.listview&ajax=true'); return _url.replace(/menuaction=[^&]+/, 'menuaction=calendar.calendar_uilist.listview&ajax=true');
} }
} }
else if (_url.indexOf('merge=') > 0)
{
// Just open the merge
window.open(_url.replace('&ajax=true',''),'_blank');
// Tell framework app took care of it
return true;
}
// can not load our own index page, has to be done by framework // can not load our own index page, has to be done by framework
return false; return false;
}, },