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

Merge 5.4.4 Gold A patches

Browse Source 
svn path=/Website/trunk/; revision=23852
This commit is contained in:
Jos Groot Lipman
2015-01-12 13:22:59 +00:00
parent 10f0cc0e6b
commit a97e4066a7
20 changed files with 82 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/API2/model_issues.inc
View File

@@ -33,7 +33,7 @@ model_issues =
{ name: "name", dbs: "mld_melding_id", typ: "varchar", sql: "ins_srtdiscipline.ins_srtdiscipline_prefix||mld_melding.mld_melding_key", filter: "exact" },
{ name: "contact", dbs: "prs_perslid_key", typ: "key", foreign: "prs_perslid", track: L("lcl_mld_name"), filter: "exact" },
{ name: "requestor", dbs: "prs_perslid_key_voor", typ: "key", foreign: "prs_perslid", track: L("lcl_mld_call_for"), filter: "exact" },
{ name: "issuedate", dbs: "mld_melding_datum", typ: "datetime", track: L("lcl_mld_date_time")},
{ name: "issuedate", dbs: "mld_melding_datum", typ: "datetime", track: L("lcl_mld_date_time"), filter: "range" },
{ name: "enddate", dbs: "mld_melding_einddatum", typ: "datetime", track: L("lcl_mld_enddate")},
{ name: "issuetype", dbs: "mld_stdmelding_key", typ: "key", foreign: "mld_stdmelding", track: L("lcl_complain"), filter: "exact" },
{ name: "description", dbs: "mld_melding_omschrijving", typ: "varchar", track: L("lcl_descr"), filter: "like" },
@@ -97,7 +97,8 @@ model_issues =
if (!params.filter.id)
{
/* You can't go any further back in time than the GUI could (ongeveer)*/
if (S("mld_max_history") > 0)
/* Als er wel een start_issuedate is dan wordt deze toegevoegd in api2.sqlfilter() verderop. */
if (!params.filter.start_issuedate && S("mld_max_history") > 0)
{
query.wheres.push("mld_melding_datum > SYSDATE - "+ S("mld_max_history"));
}