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

MARX#90181 http status bij errors in API aanroepen per persoon kunnen instellen.

Browse Source 
svn path=/Website/trunk/; revision=69955
This commit is contained in:
Jos Groot Lipman
2025-08-11 12:06:26 +00:00
parent 062ec63a8e
commit fbafaafbd6
9 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/API/api_gen_import.asp
View File

@@ -44,9 +44,9 @@
var result = api_gen_import(API, Request.BinaryRead(bytes));
xmlResp = result.xmldom;
if (API.apidata.errorhandling == 1)
if (API.apidata.errorhandling == 1 && user.errorhandling() == 1)
{
if (result.anyError) // een 'E' in imp_log
if (result.anyError) // een 'E' in imp_log
{
Response.Status = '400 Bad Request';
}

2
APPL/API/api_mldsoap.asp
View File

@@ -733,7 +733,7 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
xmlResp.appendChild(FCLTElement);
if (API.apidata.errorhandling == 1)
if (API.apidata.errorhandling == 1 && user.errorhandling() == 1)
{
if (resultcode > 0) // -1 en 0 zijn 'goed'
{

2
APPL/API/api_opdrsoap.asp
View File

@@ -1407,7 +1407,7 @@ function upsertOpdrRegels(regels, mld_opdr)
xmlResp.appendChild(FCLTElement);
if (API.apidata.errorhandling == 1)
if (API.apidata.errorhandling == 1 && user.errorhandling() == 1)
{
if (resultcode > 0) // -1 en 0 zijn 'goed'
{

2
APPL/MARX/API_mareon_opdracht.asp
View File

@@ -277,7 +277,7 @@ if (v_API)
var resultdata = api_gen_import(API_imp, xmlReq.xml, "utf-8");
var result = resultdata.xmldom;
if (API.apidata.errorhandling == 1)
if (API.apidata.errorhandling == 1 && user.errorhandling() == 1)
{
if (resultdata.anyError) // een 'E' in imp_log
{

8
APPL/MARX/API_mareon_postaction.asp
View File

@@ -83,7 +83,7 @@ var resultdata = api_gen_import(API_imp, xmlReq.xml, "utf-8");
var result = resultdata.xmldom;
if (API.apidata.errorhandling == 1)
if (API.apidata.errorhandling == 1 && user.errorhandling() == 1)
{
if (resultdata.anyError) // een 'E' in imp_log
{
@@ -102,8 +102,8 @@ if (result)
// <success>true</success>
// </result>
//</mareon>
var l_success = marx_get_success (result);
__Log("l_success:" + l_success);
@@ -132,7 +132,7 @@ if (result)
if (l_action_code == "OPDR_POST_BIJLAGE" && l_ref_key && l_success == "true")
{
// In geval van OPDR_POST_BIJLAGE kunnen we de opdracht direct PUSHen via putorders
var l_puo_immediate = marx_get_puo_immediate ();
if (l_puo_immediate){
__Log("marx_force_putorders: START");

5
APPL/PRS/prs_edit_perslid.asp
View File

@@ -72,6 +72,7 @@ if (prs_key > -1)
+ " prs_perslid_systeemadres, "
+ " prs_perslid_flags, "
+ " prs_perslid_loglevel, "
+ " prs_perslid_errorhandling, "
+ " prs_perslid_ingangsdatum, "
+ " prs_perslid_einddatum, "
+ " d.prs_bedrijf_key, "
@@ -116,6 +117,7 @@ if (prs_key > -1)
var prs_systeem= oRs("prs_perslid_systeemadres").value;
var prs_flags = oRs("prs_perslid_flags").value;
var prs_loglevel= oRs("prs_perslid_loglevel").value;
var prs_errorhandling= oRs("prs_perslid_errorhandling").value;
var prs_enddat = oRs("prs_perslid_einddatum").value;
var prs_bdrkey = oRs("prs_bedrijf_key").value;
var prs_geslacht = oRs("prs_perslid_geslacht").value;
@@ -305,6 +307,7 @@ if (prs_key > 0) // Fotoblokje alleen bij bestaande records
};
RWFIELDTR("prs_apikey_button", "button", L("lcl_prs_apiuser"), L("lcl_prs_generate_apikey"), rwparams);
ROFIELDTR("fld", "", prs_apikey, {readonly: true, maxlength: 64, trhidden: prs_apikey == null});
CHECKBOXTR(L("prs_perslid_errorhandling"), "flderrorhandling", "prs_errorhandling", prs_errorhandling );
}
if (prsauthparams.writetab)
{
@@ -317,7 +320,7 @@ if (prs_key > 0) // Fotoblokje alleen bij bestaande records
RWFIELDTR("prs_flags", "fld", L("lcl_prs_flagscode"), prs_flags, {required: true, datatype: "number" });
}
if (user.has("WEB_FACFAC"))
CHECKBOXTR(L("prs_perslid_loglevel"), "fldnotingids", "prs_loglevel", prs_loglevel );
CHECKBOXTR(L("prs_perslid_loglevel"), "fldloglevel", "prs_loglevel", prs_loglevel );
}
ROFIELDTR("fld", L("prs_perslid_inactief"), toDateTimeString(prs_inactief_datum), {suppressEmpty: true});

2
APPL/PRS/prs_edit_perslid_save.asp
View File

@@ -115,6 +115,7 @@ if (prsauthparams.writesys || (S("prs_mgt_edit_login")?xfunc.canWrite("WEB_FACMG
if (prsauthparams.writetab)
{
fields.push({ dbs: "prs_perslid_systeemadres", typ: "varchar", frm: "prs_systeemadres", track: L("lcl_prs_systeemadres") });
if ((old_flags&32)!=32)
fields.push({ dbs: "prs_perslid_flags", typ: "number", frm: "prs_flags", track: L("lcl_prs_flagscode") });
if (user.has("WEB_FACFAC"))
@@ -122,6 +123,7 @@ if (prsauthparams.writetab)
}
if (prsauthparams.writesys)
{
fields.push({ dbs: "prs_perslid_errorhandling", typ: "check0", frm: "prs_errorhandling", track: L("prs_perslid_errorhandling") });
fields.push({ dbs: "prs_perslid_opmerking", typ: "varchar", frm: "prs_opm", track: L("lcl_prs_person_opmerking") });
}
var prs_lang = getFParam("prs_lang", "");

7
APPL/PRS/prs_show_perslid.asp
View File

@@ -49,6 +49,7 @@ var sql = "SELECT p.prs_perslid_key, "
+ " p.prs_perslid_oslogin2, "
+ " p.prs_perslid_opmerking, "
+ " p.prs_perslid_apikey, "
+ " p.prs_perslid_errorhandling, "
+ " p.prs_perslid_otpsecret,"
+ " p.prs_perslid_otpcounter,"
+ " p.prs_perslid_ingangsdatum, "
@@ -112,6 +113,7 @@ var prs_oslog = oRs("prs_perslid_oslogin").value;
var prs_oslog2 = oRs("prs_perslid_oslogin2").value;
var prs_opm = oRs("prs_perslid_opmerking").value;
var prs_apikey = oRs("prs_perslid_apikey").value;
var prs_errorhandling = oRs("prs_perslid_errorhandling").value;
var prs_ingdat = new Date(oRs("prs_perslid_ingangsdatum").value);
var prs_enddat = oRs("prs_perslid_einddatum").value!=null?new Date(oRs("prs_perslid_einddatum").value):null;
var prs_bdrkey = oRs("prs_bedrijf_key").value;
@@ -376,6 +378,7 @@ if (res_authparams)
if (!prsauthparams.writetab)
var showkey = showkey.substr(0,3) + "..." + showkey.substr(showkey.length-3);
ROFIELDTR("fld", L("lcl_prs_apiuser"), showkey, {suppressEmpty: true, secret: true });
ROCHECKBOXTR("flderrorhandling", L("prs_perslid_errorhandling"), loglevel);
}
var recent = new Date();
@@ -415,7 +418,7 @@ if (res_authparams)
if (flagtxt.length)
ROFIELDTR("fld", L("lcl_prs_flags"), flagtxt.join("\n"));
if (loglevel || user.has("WEB_FACFAC") )
CHECKBOXTR(L("prs_perslid_loglevel"), "fldnotingids", "prs_perslid_loglevel", loglevel, { html: " disabled" });
ROCHECKBOXTR("fldloglevel", L("prs_perslid_loglevel"), loglevel);
}
if (prsauthparams.writesys)
{
@@ -425,7 +428,7 @@ if (res_authparams)
BLOCK_START("prsPerslid2", L("lcl_prs_organisatieblok"), { icon: "fa-address-card"} );
if (prsauthparams.writesys)
CHECKBOXTR(L("lcl_prs_in_guide"), "fldnotingids", "not_ingids", ingids, { html: " disabled" });
ROCHECKBOXTR("fldnotingids", L("lcl_prs_in_guide"), ingids);
ROFIELDTR("fld", L("lcl_prs_person_nr"), prs_nr, {suppressEmpty: true});
var params_afd = { infoPointer: { Url: "appl/prs/prs_afdeling.asp?key=" + prs_afdkey
}

8
APPL/Shared/User.inc
View File

@@ -70,6 +70,7 @@ Perslid.prototype._require_prs_perslid = function __require_prs_perslid()
+ " , p.prs_perslid_options"
+ " , p.prs_perslid_wachtwoord_exp"
+ " , p.prs_perslid_apikey"
+ " , p.prs_perslid_errorhandling"
+ " , p.prs_perslid_terms_version"
+ " , p.prs_perslid_timezone"
+ " , p.prs_perslid_lcid"
@@ -122,6 +123,7 @@ Perslid.prototype._require_prs_perslid = function __require_prs_perslid()
this._prs_perslid_lcid = oRs("prs_perslid_lcid").value;
this._prs_perslid_visibility = oRs("prs_perslid_visibility").value;
this._prs_perslid_key_verantw = oRs("prs_perslid_key_verantw").value;
this._prs_perslid_errorhandling = oRs("prs_perslid_errorhandling").value;
if (this._prs_perslid_options)
{
@@ -565,6 +567,12 @@ Perslid.prototype.lang = function()
return user_lang;
}
Perslid.prototype.errorhandling = function()
{
this._require_prs_perslid();
return this._prs_perslid_errorhandling;
}
// Let op: Bij newval is het resultaat true/false of het opslaan al dan niet gelukt is.
// Het 'mislukt' als alle settings samen meer dan 4000 karakters zouden worden.
Perslid.prototype.options = function(optionname, newval)