From b57a291713ebbb2c8f436a62cc092d070df67428 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Wed, 29 Mar 2023 07:38:36 +0000 Subject: [PATCH] BAMG#76289 Informatie linken van Locatie - gebouw - contract svn path=/Website/trunk/; revision=59790 --- APPL/ALG/alg_district.asp | 6 +++--- APPL/ALG/alg_locatie.asp | 25 ++++--------------------- APPL/ALG/alg_regio.asp | 5 ++--- APPL/ALG/alg_verdieping.asp | 9 ++------- 4 files changed, 11 insertions(+), 34 deletions(-) diff --git a/APPL/ALG/alg_district.asp b/APPL/ALG/alg_district.asp index eb145b0369..aed4b41319 100644 --- a/APPL/ALG/alg_district.asp +++ b/APPL/ALG/alg_district.asp @@ -74,13 +74,13 @@ else if (dis_key > -1) { + page0 = "../alg/alg_locatie_search_list.asp?districtkey="+dis_key; + IFRAMER("alglocatieframe", page0, { icon: "fa-list" } ); + var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"]; var authparams = user.checkAutorisation(autfunction, true); if (authparams && authparams.ALGreadlevel <= 1 && authparams.PRSreadlevel < 9) { - page0 = "../alg/alg_locatie_search_list.asp?districtkey="+dis_key; - IFRAMER("alglocatieframe", page0, { icon: "fa-list" } ); - // tracking naar subframe :-) page1 = protectQS.create("../shared/status_info.asp?dis_key=" + dis_key); IFRAMER("alghistoryframe", page1, { icon: "fa-list", title: L("lcl_tracking")} ); diff --git a/APPL/ALG/alg_locatie.asp b/APPL/ALG/alg_locatie.asp index fa0ad1359b..0523123856 100644 --- a/APPL/ALG/alg_locatie.asp +++ b/APPL/ALG/alg_locatie.asp @@ -84,27 +84,10 @@ else if (loc_key > -1) { var urole = "bo"; - var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"]; - var authparams = user.checkAutorisation(autfunction, true); - if (authparams && authparams.ALGreadlevel <= 0 && authparams.PRSreadlevel < 9) - { - var sql = "SELECT COUNT(*) aantal FROM alg_gebouw WHERE alg_gebouw_verwijder IS NULL AND alg_locatie_key = " + loc_key; - var oRs = Oracle.Execute(sql); - if (oRs("aantal").Value > 0) - { - var page0 = "../alg/alg_gebouw_search_list.asp?urole=" + urole +"&locatiekey="+loc_key; - IFRAMER("alggebouwframe", page0, { icon: "fa-list"} ); - } - oRs.Close(); - var sql = "SELECT COUNT(*) aantal FROM alg_terreinsector WHERE alg_terreinsector_verwijder IS NULL AND alg_locatie_key = " + loc_key; - var oRs = Oracle.Execute(sql); - if (oRs("aantal").Value > 0) - { - var page1 = "../alg/alg_terreinsector_search_list.asp?urole=" + urole +"&locatiekey="+loc_key; - IFRAMER("algterreinframe", page1, { icon: "fa-list"} ); - } - oRs.Close(); - } + var page0 = "../alg/alg_gebouw_search_list.asp?urole=" + urole +"&locatiekey="+loc_key; + IFRAMER("alggebouwframe", page0, { icon: "fa-list"} ); + var page1 = "../alg/alg_terreinsector_search_list.asp?urole=" + urole +"&locatiekey="+loc_key; + IFRAMER("algterreinframe", page1, { icon: "fa-list"} ); var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true); var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true); diff --git a/APPL/ALG/alg_regio.asp b/APPL/ALG/alg_regio.asp index 061b0874a8..84d2c61647 100644 --- a/APPL/ALG/alg_regio.asp +++ b/APPL/ALG/alg_regio.asp @@ -56,14 +56,13 @@ var reg_key = getQParamInt("key", -1); if (reg_key > -1) { + page0 = "../alg/alg_district_search_list.asp?regiokey="+reg_key; + IFRAMER("algdistrictframe", page0, { icon: "fa-list" } ); var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"]; var authparams = user.checkAutorisation(autfunction, true); if (authparams && authparams.ALGreadlevel <= 0 && authparams.PRSreadlevel < 9) { - page0 = "../alg/alg_district_search_list.asp?regiokey="+reg_key; - IFRAMER("algdistrictframe", page0, { icon: "fa-list" } ); - // tracking naar subframe :-) page1 = protectQS.create("../shared/status_info.asp?reg_key=" + reg_key); IFRAMER("alghistoryframe", page1, { icon: "fa-list", title: L("lcl_tracking")} ); diff --git a/APPL/ALG/alg_verdieping.asp b/APPL/ALG/alg_verdieping.asp index 0182d8d548..5d5eba38d3 100644 --- a/APPL/ALG/alg_verdieping.asp +++ b/APPL/ALG/alg_verdieping.asp @@ -88,13 +88,8 @@ else if (flr_key > -1) { - var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"]; - var authparams = user.checkAutorisation(autfunction, true); - if (authparams && authparams.ALGreadlevel <= 1 && authparams.PRSreadlevel < 9) - { - page0 = "../alg/alg_ruimte_search_list.asp?chkgeb=1&verdiepingkey="+flr_key; - IFRAMER("algruimteframe", page0, { icon: "fa-list" } ); - } + page0 = "../alg/alg_ruimte_search_list.asp?chkgeb=1&verdiepingkey="+flr_key; + IFRAMER("algruimteframe", page0, { icon: "fa-list" } ); var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true); var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);