diff --git a/APPL/MLD/mld.inc b/APPL/MLD/mld.inc index daac446ebc..4165d77395 100644 --- a/APPL/MLD/mld.inc +++ b/APPL/MLD/mld.inc @@ -1407,8 +1407,10 @@ mld = {setmeldingstatus: if (caller_key) sqln += " AND m.prs_perslid_key = " + caller_key; - if (behandel_key) + if (behandel_key > 0) sqln += " AND m.mld_melding_behandelaar_key = " + behandel_key; + else if (behandel_key == -2) + sqln += " AND m.mld_melding_behandelaar_key IS NULL"; if (ref_key && ref_type) sqln += " AND m.mld_melding_kto_key = " + ref_key diff --git a/APPL/MLD/mld_list.inc b/APPL/MLD/mld_list.inc index 9a317dad2a..ed1cd1d7eb 100644 --- a/APPL/MLD/mld_list.inc +++ b/APPL/MLD/mld_list.inc @@ -909,7 +909,7 @@ function mld_list (pautfunction, params) { // als je er op filtert weet je het wel, maar op de print vind ik wel leuk // als de frontend bij de statusinfo niet mag zien Wie het doet, mag die hier ook niet de behandelaar zien - if ((!behandel_key || print) && !(frontend && S("mld_fe_show_statusnames") == 0)) + if ((!(behandel_key>0) || print) && !(frontend && S("mld_fe_show_statusnames") == 0)) rst.addColumn(new Column({caption: L("lcl_mld_behandelaar"), content: fncolBehandelaar })); rst.addColumn(new Column({caption: L("lcl_end_date_plan"), content: fncolEindDatum, nowrap: true})); diff --git a/APPL/MLD/mld_search.asp b/APPL/MLD/mld_search.asp index 01b4a7b926..3490c7cce3 100644 --- a/APPL/MLD/mld_search.asp +++ b/APPL/MLD/mld_search.asp @@ -66,6 +66,7 @@ + <% FCLTHeader.Requires({plugins:["jQuery", "kenmerk"], @@ -996,6 +997,7 @@ if (!frontend && srtdisc > -1) trclass: "primsearch noxd", /* als wel xd: _self zou leuk zijn */ autlevel: authparams.PRSreadlevel, autlevelALG: authparams.ALGreadlevel, + addfixedoption: { txt: L('lcl_suggestemptytxt'), desc: L('lcl_suggestemptydesc'), key: -2 }, whenEmpty: L("lcl_search_generic") // want filter }); } diff --git a/APPL/Shared/Suggest/suggest.js b/APPL/Shared/Suggest/suggest.js index 86a415884d..bcd94b6045 100644 --- a/APPL/Shared/Suggest/suggest.js +++ b/APPL/Shared/Suggest/suggest.js @@ -17,6 +17,7 @@ params.highlightDescript, params.noJustOne, params.JSONP + params.addemptyoption voegt een 'Leeg' toe met key=-2 params.embedded Kijk nooit naar het parent document (embedded) Context: Note: Pas op met gebruiken functies uit andere modules. Dit bestand @@ -643,6 +644,9 @@ function Suggest(inParams) showAutocompleteDiv(); resultsObj = data; + if (params.addfixedoption) + resultsObj.result.unshift(params.addfixedoption); + selected = resultsObj.isAll? Math.min(resultsObj.result.length - 1, 10 - 1) : 0; // voorheen htmlFormat(checkExist, doonChange), nu ingeplakt diff --git a/APPL/Shared/persoonselector.inc b/APPL/Shared/persoonselector.inc index 739d102451..5710233283 100644 --- a/APPL/Shared/persoonselector.inc +++ b/APPL/Shared/persoonselector.inc @@ -190,6 +190,7 @@ function FCLTpersoonselector(fieldName, objectName, params) <%=params.extraParamField? ", initExtraParam: \"" + safe.jsstring("" + lextraInit) + "\"": ""%> <%=params.isBad? ", isBad: true": ""%> <%=params.readonly? ", fieldReadonly: true": ""%> + <%=params.addfixedoption? ", addfixedoption: JSON.parse('" + safe.jsstring(JSON.stringify(params.addfixedoption)) + "')": ""%> // ,highlightDescript: true }); if (FcltMgr.getCaller())