From fce1bad1f4a6152e4e35e41e0b5f6de8fbada123 Mon Sep 17 00:00:00 2001
From: Erik Groener <erik.groener@aareon.nl>
Date: Fri, 18 Nov 2016 09:26:38 +0000
Subject: [PATCH] FSN#38203 Favorieten menu kunnen aanleggen

svn path=/Website/trunk/; revision=31562
---
 APPL/FAC/fac_menu.inc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/APPL/FAC/fac_menu.inc b/APPL/FAC/fac_menu.inc
index 7093f443d2..e52594ea6d 100644
--- a/APPL/FAC/fac_menu.inc
+++ b/APPL/FAC/fac_menu.inc
@@ -232,6 +232,7 @@ function generatePortalmenu(koppen)
              + "        || CASE WHEN m.ins_discipline_key IS NOT NULL THEN '&dis_key='|| m.ins_discipline_key END "
              + "        || CASE WHEN m.ins_srtdiscipline_key IS NOT NULL THEN '&srtdisc='|| m.ins_srtdiscipline_key END "
              + "        url "
+             + "      , fac_menu_filter  filter"
              + selectImage
              + "      , COALESCE (fac_menu_altgroep, fac_menuitems_groep) groep"
              + "      , fac_menu_level "
@@ -297,6 +298,7 @@ function generatePortalmenu(koppen)
              +          lcl.xsql('d.ins_discipline_omschrijving', 'd.ins_discipline_key')
              + "        exploded "
              + "      , COALESCE (fac_menu_alturl, fac_menuitems_url) || '&dis_key='|| d.ins_discipline_key url "
+             + "      , fac_menu_filter  filter"
              + "      , COALESCE (fac_menu_image, fac_menuitems_image) image"
              + "      , COALESCE (fac_menu_altgroep, fac_menuitems_groep)groep"
              + "      , fac_menu_level "
@@ -376,6 +378,7 @@ function generatePortalmenu(koppen)
              + "      , " + lcl.xsql2('COALESCE (fac_menu_altlabel, fac_menuitems_label)', 'FAC_MENU_ALTLABEL', 'fac_menu_key') + " label"
              + "      , " + lcl.xsql('sd.ins_srtdiscipline_omschrijving', 'sd.ins_srtdiscipline_key') + " exploded"
              + "      , COALESCE (m.fac_menu_alturl, mi.fac_menuitems_url) || '&srtdisc='|| sd.ins_srtdiscipline_key url "
+             + "      , fac_menu_filter  filter"
              + "      , COALESCE (m.fac_menu_image, mi.fac_menuitems_image) image"
              + "      , COALESCE (m.fac_menu_altgroep, mi.fac_menuitems_groep) groep"
              + "      , m.fac_menu_level "
@@ -457,6 +460,7 @@ function generatePortalmenu(koppen)
              + "      , " + lcl.xsql2('COALESCE (fac_menu_altlabel, fac_menuitems_label)', 'FAC_MENU_ALTLABEL', 'fac_menu_key') + " label"
              + "      , " + lcl.xsql('sa.res_srtactiviteit_omschrijving', 'sa.res_srtactiviteit_key') + " exploded"
              + "      , COALESCE (m.fac_menu_alturl, mi.fac_menuitems_url) || '&srtact=' || sa.res_srtactiviteit_key url "
+             + "      , fac_menu_filter  filter"
              + "      , COALESCE (m.fac_menu_image, mi.fac_menuitems_image) image"
              + "      , COALESCE (m.fac_menu_altgroep, mi.fac_menuitems_groep) groep"
              + "      , m.fac_menu_level "
@@ -602,8 +606,12 @@ function generatePortalmenu(koppen)
               }
               else
               {
+                  var url = loRs("url").Value;
+                  var filters = loRs("filter").Value;
+                  var xurl = url + (url.indexOf("?")>0?"&":"?") + (filters ? "fcltfilters=" + safe.url(filters) : "");
+
                   kop.Items.push({name: mlabel,
-                                  href: loRs("url").value ,
+                                  href: xurl,
                                   info: loRs("fac_menu_info").value,
                                   depth: loRs("depth").value,
                                   img:  loRs("image").value,