From 59797e58dce6ba7056ce71fbc4db9c2b9916db56 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Tue, 16 May 2017 10:53:38 +0000 Subject: [PATCH] HSLE#36221 Invulscherm bij cateringbestelling alleen bepaalde ruimtetypen tonen. svn path=/Website/trunk/; revision=33868 --- APPL/RES/res_edit_rsv_ruimte.asp | 2 +- APPL/Shared/Suggest/plaatsFilter.inc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/APPL/RES/res_edit_rsv_ruimte.asp b/APPL/RES/res_edit_rsv_ruimte.asp index 186ed0673e..d3755bf12e 100644 --- a/APPL/RES/res_edit_rsv_ruimte.asp +++ b/APPL/RES/res_edit_rsv_ruimte.asp @@ -1313,7 +1313,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"], } // Plaatsselector is altijd afhankelijk van activiteit - urlAdd.push({urlParam: "act_key", val: rrr.activiteit_key, init: rrr.activiteit_key}); + urlAdd.push({urlParam: "act_key", field: "sel_activity", init: rrr.activiteit_key}); if (getQParamInt("disc_key", -1) > 0) urlAdd.push({urlParam: "disc_key", val: getQParamInt("disc_key"), init: getQParamInt("disc_key")}); diff --git a/APPL/Shared/Suggest/plaatsFilter.inc b/APPL/Shared/Suggest/plaatsFilter.inc index 4646b7e72e..e90fe90e51 100644 --- a/APPL/Shared/Suggest/plaatsFilter.inc +++ b/APPL/Shared/Suggest/plaatsFilter.inc @@ -669,6 +669,7 @@ function get_res_bezorgfilter(params, level) + " WHERE rd.res_ins_deel_key = id.ins_deel_key" + " AND COALESCE(id.ins_alg_ruimte_type_org, id.ins_alg_ruimte_type) = 'R'" + " AND COALESCE(id.ins_alg_ruimte_key_org, id.ins_alg_ruimte_key) = aob.alg_ruimte_key" + + " AND res_deel_alg_level > -1" + (res_deel_key > 0 ? " AND res_deel_key = " + res_deel_key : ""); var oRs = Oracle.Execute(sql); res_deel_alg_level = oRs("res_deel_alg_level").Value; @@ -677,8 +678,8 @@ function get_res_bezorgfilter(params, level) if (level >= 4 && res_deel_alg_level == 4) filter_deel = "vv.alg_verdieping_key IN "; if (level >= 3 && res_deel_alg_level == 3) filter_deel = "gg.alg_gebouw_key IN "; if (level >= 2 && res_deel_alg_level == 2) filter_deel = "ll.alg_locatie_key IN "; - if (level >= 1 && res_deel_alg_level == 1) filter_deel = "rg.alg_regio_key IN "; - if (level >= 0 && res_deel_alg_level == 0) filter_deel = "di.alg_district_key IN "; + if (level >= 1 && res_deel_alg_level == 1) filter_deel = "ll.alg_locatie_key IN "; //"rg.alg_regio_key IN "; + if (level >= 0 && res_deel_alg_level == 0) filter_deel = "ll.alg_locatie_key IN "; //"di.alg_district_key IN "; oRs.close(); // }