diff --git a/APPL/API/shorturl.asp b/APPL/API/shorturl.asp index 4d7a052192..91cc9efbf0 100644 --- a/APPL/API/shorturl.asp +++ b/APPL/API/shorturl.asp @@ -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 + "/"; diff --git a/APPL/API2/model_reports.inc b/APPL/API2/model_reports.inc index a97f9f88f6..c20632fc1a 100644 --- a/APPL/API2/model_reports.inc +++ b/APPL/API2/model_reports.inc @@ -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 {0} 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]; }