From 82aaa6b55acebf3d001f677c971074731402eea4 Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Mon, 26 Jun 2017 16:14:39 +0000
Subject: [PATCH] FSN#41081 Niet meer 'optional' filteren op HTML-kolommen

svn path=/Website/branches/v2017.1/; revision=34430
---
 APPL/API2/api2.inc              | 4 +++-
 APPL/SCF/scaffolding_search.inc | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/APPL/API2/api2.inc b/APPL/API2/api2.inc
index 1f48503770..1cb1db8b8a 100644
--- a/APPL/API2/api2.inc
+++ b/APPL/API2/api2.inc
@@ -147,6 +147,7 @@ api2 = {
                             break;
                         case "varchar":
                         case "memo":
+                        case "html":
                             filter = "like";
                             break;
                         case "date":
@@ -308,6 +309,7 @@ api2 = {
                             break;
                         case "varchar": // Als fld.match(/^fclt_d_/) dan is het een old-style rapport filterveld
                         case "memo":
+                        case "html":
                             if (filterval instanceof Array)
                             {
                                 safe_val = safe.quoted_sql_join(filterval);
@@ -406,7 +408,7 @@ api2 = {
                     {
                       if (operand != " IN ")
                         operand = " LIKE ";
-                      if (field.typ == "varchar" || field.typ == "memo")
+                      if (field.typ == "varchar" || field.typ == "memo" || field.typ == "html")
                       {
                         dbs = "UPPER("+dbs+")";
                         safe_val = safe_val.toUpperCase();
diff --git a/APPL/SCF/scaffolding_search.inc b/APPL/SCF/scaffolding_search.inc
index 456b5d1895..52deb45537 100644
--- a/APPL/SCF/scaffolding_search.inc
+++ b/APPL/SCF/scaffolding_search.inc
@@ -239,6 +239,8 @@ function scaffolding_search(model, scf_params)
             // Deze kun je ook niet aanzetten. Dan is filteren ook niet logisch denk ik
             if (field.hidden || field.typ=="label" || field.visible == "H")
                 continue;
+            if (field.typ == "html") // te raar om op te filteren
+                continue;
             if (!field.label || field.label == '<hidden>' || !field.dbs)
                 continue;
             if (!inArray(fld, scf_params.search.filters))
@@ -341,6 +343,8 @@ function scaffolding_search(model, scf_params)
 <%
         for (var fld in model.fields) // Nu alle optionele filters
         {
+            if (model.fields[fld] == "html") // te raar om op te filteren
+                continue;
             if (!inArray(fld, scf_params.search.filters))
                 scf_search_field(model, fld, defaults, scf_params)
         }