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

AAIT#41525 API2 E-mail filtering caseinsensitive

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34840
This commit is contained in:
Jos Groot Lipman
2017-08-07 08:46:46 +00:00
parent b1d812dab0
commit ea0a653a0e
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/API2/api2.inc
View File

@@ -327,7 +327,12 @@ api2 = {
var safe_val = safe.quoted_sql_wild(filterval); var safe_val = safe.quoted_sql_wild(filterval);
} }
else else
var safe_val = safe.quoted_sql(filterval); {
if (field.caseinsensitive)
var safe_val = safe.quoted_sql_upper(filterval);
else
var safe_val = safe.quoted_sql(filterval);
}
break; break;
case "like": case "like":
var safe_val = safe.quoted_sql_wild("%"+filterval+"%"); var safe_val = safe.quoted_sql_wild("%"+filterval+"%");
@@ -412,10 +417,14 @@ api2 = {
{ {
if (field.islcl) if (field.islcl)
dbs = 'lcl.l({0}, 1)'.format(dbs); dbs = 'lcl.l({0}, 1)'.format(dbs);
dbs = "UPPER("+dbs+")"; field.caseinsensitive = true;
safe_val = safe_val.toUpperCase();
} }
} }
if (field.caseinsensitive)
{
dbs = "UPPER(" + dbs + ")";
safe_val = safe_val.toUpperCase();
}
if (filter == "range" && fld.match(/^fclt_d_/)) if (filter == "range" && fld.match(/^fclt_d_/))
{ {
dbs = "TO_DATE(" + dbs + ",'dd-mm-yyyy')"; dbs = "TO_DATE(" + dbs + ",'dd-mm-yyyy')";

8
APPL/API2/model_prs_perslid.inc
View File

@@ -122,13 +122,14 @@ function model_prs_perslid(params)
"dbs": "prs_perslid_email", "dbs": "prs_perslid_email",
"label": L("lcl_prs_person_email"), "label": L("lcl_prs_person_email"),
"typ": "varchar", "typ": "varchar",
"filter": "exact" "filter": "exact",
"caseinsensitive": true
}, },
"login": { "login": {
"dbs": "prs_perslid_oslogin", "dbs": "prs_perslid_oslogin",
"label": L("lcl_prs_person_login"), "label": L("lcl_prs_person_login"),
"typ": "varchar", "typ": "varchar",
"filter": "like" "filter": "exact"
}, },
"employment": { "employment": {
"dbs": "prs_perslid_dienstverband", "dbs": "prs_perslid_dienstverband",
@@ -172,8 +173,7 @@ function model_prs_perslid(params)
"dbs": "wg.alg_locatie_key", "dbs": "wg.alg_locatie_key",
"label": L("lcl_location"), "label": L("lcl_location"),
"typ": "key", "typ": "key",
"foreign": "alg_locatie", "foreign": "alg_locatie"
"filter": "exact"
}, },
"building": { "building": {
"dbs": "wg.alg_gebouw_key", "dbs": "wg.alg_gebouw_key",