FSN#38313 shorturl ondersteunen bij rapport klikacties

svn path=/Website/branches/v2016.2/; revision=31422
This commit is contained in:
Jos Groot Lipman
2016-11-10 14:33:41 +00:00
parent 28d7e739de
commit 65fe85e169
2 changed files with 5 additions and 1 deletions

View File

@@ -154,7 +154,7 @@
else
var theURL = protectQS.create(url);
if (isKnownBookmark && !isMobile)
if (isKnownBookmark && !isMobile && getQParamInt("internal", 0) == 0)
{
Session("FirstPage") = theURL;
theURL = rooturl + "/";

View File

@@ -169,6 +169,7 @@ function model_reports(fac_usrrap_key)
model.record_name = usrrap.viewname.substring(0,1) + usrrap.viewname.substring(1).toLowerCase();
model.records_name = model.record_name + "s";
model.record_title = usrrap.name; // (initiele) titel bij urllink
model.records_title = usrrap.name;
model.autorefresh = usrrap.autorefresh;
model.styling = usrrap.styling;
@@ -186,6 +187,9 @@ function model_reports(fac_usrrap_key)
if (!mtc || mtc.length != 3)
shared.simpel_page("Urllink <em>{0}</em> in rapport moet formaat 'xxxx/yyy.asp?key={keyveld}' hebben.".format(usrrap.urllink));
model.list.default_url = mtc[1];
// Voorkom dat hij binnen menu-wrapper wordt getoond
if (mtc[1].indexOf("?u=") == 0)
model.list.default_url = "?internal=1&" + mtc[1].substring(1);
keyfield = mtc[2];
}