admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#41081 Niet meer 'optional' filteren op HTML-kolommen

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34430
This commit is contained in:
Jos Groot Lipman
2017-06-26 16:14:39 +00:00
parent aa3a77ac50
commit 82aaa6b55a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/API2/api2.inc
View File

@@ -147,6 +147,7 @@ api2 = {
break; break;
case "varchar": case "varchar":
case "memo": case "memo":
case "html":
filter = "like"; filter = "like";
break; break;
case "date": case "date":
@@ -308,6 +309,7 @@ api2 = {
break; break;
case "varchar": // Als fld.match(/^fclt_d_/) dan is het een old-style rapport filterveld case "varchar": // Als fld.match(/^fclt_d_/) dan is het een old-style rapport filterveld
case "memo": case "memo":
case "html":
if (filterval instanceof Array) if (filterval instanceof Array)
{ {
safe_val = safe.quoted_sql_join(filterval); safe_val = safe.quoted_sql_join(filterval);
@@ -406,7 +408,7 @@ api2 = {
{ {
if (operand != " IN ") if (operand != " IN ")
operand = " LIKE "; operand = " LIKE ";
if (field.typ == "varchar" || field.typ == "memo") if (field.typ == "varchar" || field.typ == "memo" || field.typ == "html")
{ {
dbs = "UPPER("+dbs+")"; dbs = "UPPER("+dbs+")";
safe_val = safe_val.toUpperCase(); safe_val = safe_val.toUpperCase();

4
APPL/SCF/scaffolding_search.inc
View File

@@ -239,6 +239,8 @@ function scaffolding_search(model, scf_params)
// Deze kun je ook niet aanzetten. Dan is filteren ook niet logisch denk ik // Deze kun je ook niet aanzetten. Dan is filteren ook niet logisch denk ik
if (field.hidden || field.typ=="label" || field.visible == "H") if (field.hidden || field.typ=="label" || field.visible == "H")
continue; continue;
if (field.typ == "html") // te raar om op te filteren
continue;
if (!field.label || field.label == '<hidden>' || !field.dbs) if (!field.label || field.label == '<hidden>' || !field.dbs)
continue; continue;
if (!inArray(fld, scf_params.search.filters)) 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 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)) if (!inArray(fld, scf_params.search.filters))
scf_search_field(model, fld, defaults, scf_params) scf_search_field(model, fld, defaults, scf_params)
} }