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

FSN#40637 API2 tester/ gevonden foutjes

Browse Source 
svn path=/Website/branches/v2017.1/; revision=33974
This commit is contained in:
Jos Groot Lipman
2017-05-23 12:55:59 +00:00
parent 6e47808cd7
commit 34aa12857f
10 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/API2/api2_dispatch.inc
View File

@@ -69,7 +69,7 @@ var api2_mapper = {
"knowledgeproperties" : { "filename": "appl/mgt/faq_kenmerk.asp" },
"vattables" : { "filename": "appl/mgt/fin_btwtabel.asp" },
"invoiceproperties" : { "filename": "appl/mgt/fin_kenmerk.asp" },
"saleinvoicelines" : { "filename": "appl/mgt/fin_verkoopfactuur.asp", "nodoc": true },
// "saleinvoicelines" : { "filename": "appl/mgt/fin_verkoopfactuur.asp", "nodoc": true },
"taskhandlings" : { "filename": "appl/mgt/ins_controlemode.asp" },
"objectdisciplines" : { "filename": "appl/mgt/ins_discipline.asp" },
"objectproperties" : { "filename": "appl/mgt/ins_kenmerk.asp" },
@@ -99,7 +99,7 @@ var api2_mapper = {
"issuetypes" : { "filename": "appl/api2/api_issuetypes.asp", "module": "MLD" },
"pinboardcategories" : { "filename": "appl/mgt/mrk_discipline.asp" },
"services" : { "filename": "appl/mgt/prs_dienst.asp" },
"basisproperties" : { "filename": "appl/mgt/prs_kenmerk.asp", "nodoc": true },
"basisproperties" : { "filename": "appl/mgt/prs_kenmerk.asp", "docparam": "&level=P" },
"combinationvalidation" : { "filename": "appl/mgt/prs_kostencombinatie.asp" },
"costtypes" : { "filename": "appl/mgt/prs_kostensoort.asp" },
"costtypegroups" : { "filename": "appl/mgt/prs_kostensoortgrp.asp" },
@@ -133,7 +133,7 @@ var api2_mapper = {
"about" : { "filename": "appl/api2/api_about.asp", "module": "API" },
"cadcontours" : { "filename": "appl/api2/api_cadcontours.asp", "module": "CAD" },
"contracts" : { "filename": "appl/api2/api_contracts.asp", "module": "CNT" },
"notes" : { "filename": "appl/api2/api_notes.asp", "module": "FAC", "nodoc": true },
"notes" : { "filename": "appl/api2/api_notes.asp", "module": "FAC", "docparam": "&module=MLD" },
"approvals" : { "filename": "appl/api2/api_approvals.asp", "module": "FAC" },
"settings" : { "filename": "appl/api2/api_settings.asp", "module": "FAC" },
"reportsx" : { "filename": "appl/api2/api_reportsx.asp", "module": "FAC" },

2
APPL/API2/api2_rest.inc
View File

@@ -266,6 +266,8 @@ api2_rest = {
var result = { id: model.records_name,
"name": model.record_title,
"names": model.records_title,
"records_name": model.records_name,
"record_name": model.record_name,
"authorization": model.autfunction,
methods: [],
includes: [],

4
APPL/API2/model_apis.inc
View File

@@ -49,6 +49,10 @@ model_apis =
}
if (api2_mapper[dispatch].lcl_name)
apidata.name = L(api2_mapper[dispatch].lcl_name);
if ("docparam" in api2_mapper[dispatch])
apidata.docparam = api2_mapper[dispatch].docparam;
if ("nodoc" in api2_mapper[dispatch])
apidata.nodoc = api2_mapper[dispatch].nodoc;
var lclname = "{0}_m".format(filename.split(".")[0]); // alg_ruimte_m
lcl2fld[lclname] = apidata;

2
APPL/API2/model_aut_client.inc
View File

@@ -45,7 +45,7 @@ function model_aut_client(params)
"label": L("aut_client_type"),
"typ": "key",
"required": true,
"LOV": L("fac_aut_typeLOV") // TODO?
"LOV": L("aut_client_typeLOV")
},
"remark": {
"dbs": "aut_client_opmerking",

4
APPL/API2/model_fac_functie.inc
View File

@@ -66,7 +66,7 @@ function model_fac_functie (functie_key, params)
"sequence": {
"dbs": "fac_functie_volgnr",
"label": L("fac_functie_volgnr"),
"readonly": !user.has("WEB_FACFAC"),
"readonly": !user || !user.has("WEB_FACFAC"),
"typ": "number"
},
"level": {
@@ -124,7 +124,7 @@ function model_fac_functie (functie_key, params)
"fac_functie_discipline = 1" // dan ook alleen de discipline gebonden functies
);
}
if (!user.has("WEB_FACFAC"))
if (!user || !user.has("WEB_FACFAC"))
{
xparams.GET.wheres.push("fac_functie_code NOT IN ('WEB_FACFAC', 'WEB_FACTAB')");
}

4
APPL/API2/model_fac_groep.inc
View File

@@ -85,7 +85,7 @@ function model_fac_groep(groep_key, params)
// Groepen met WEB_FACFAC en WEB_FACTAB zie je niet als je die rechten niet zelf hebt
var xparams = { GET: { wheres: [] } }
if (!user.has("WEB_FACFAC"))
if (!user || !user.has("WEB_FACFAC"))
{
xparams.GET.wheres.push( "fac_groep.fac_groep_key NOT IN"
+ " (SELECT fac_groep_key"
@@ -94,7 +94,7 @@ function model_fac_groep(groep_key, params)
+ " WHERE fgr.fac_functie_key = ff.fac_functie_key"
+ " AND ff.fac_functie_code = 'WEB_FACFAC')");
}
if (!user.has("WEB_FACTAB"))
if (!user || !user.has("WEB_FACTAB"))
{
xparams.GET.wheres.push( "fac_groep.fac_groep_key NOT IN"
+ " (SELECT fac_groep_key"

2
APPL/API2/model_reservablerooms.inc
View File

@@ -130,7 +130,7 @@ model_reservablerooms =
}
},
"configurations": { model: new model_res_ruimte_opstelling(),
joinfield: "res_ruimte_key"
joinfield: "bookingroom"
},
"occupations": { // prefunc om alles tegelijk op te halen
prefunc: function _occupations(params)

5
APPL/MGT/fac_audit.asp
View File

@@ -19,9 +19,10 @@
// Hmac controle en anders FACTAB eisen?
if (getQParam("hmac", ""))
{
protectQS.verify({ allowparams: ["outputmode", "showall", "autosortby", "no_autoscroll", "scf_highlight"]}); // tamper check
else
user.checkAutorisation("WEB_PRSSYS");
model_fac_audit.autfunction = false; // model hoeft niet meer op PRSSYS re controleren
}
function gettablesql(ptable, pchildtable, pchildrecord, precord, pmtable)
{ // Parentkey's van de childwaarden.

2
APPL/MGT/fac_usrtab.asp
View File

@@ -5,7 +5,7 @@
<!-- #include file="../api2/model_fac_usrtab.inc" -->
<%
scaffolding(new model_fac_usrtab(),
scaffolding(model_fac_usrtab,
{
"search": {
"autosearch": true,

4
APPL/MGT/res_ruimte.asp
View File

@@ -8,9 +8,7 @@ var url = "appl/shared/BijlagenForm.asp?module=RESPH";
var proturl = protectQS.create(url);
var fotoaction = "FcltMgr.openDetail('" + safe.jsstring(proturl) + "', L(\"lcl_photos\"))";
var this_model = new model_res_ruimte();
scaffolding(this_model,
scaffolding(model_res_ruimte,
{
"search": {
"autosearch": false,