Layout aanpassing: veldnamen altijd lowercase in queries

svn path=/Website/trunk/; revision=35028
This commit is contained in:
Jos Groot Lipman
2017-08-21 19:38:36 +00:00
parent ce787059a2
commit 92f94663e5

View File

@@ -896,10 +896,10 @@ Perslid.prototype.checkAutorisation_readit = function _checkAutorisation_readit(
}
// MIN om te kijken over alle mogelijke disciplines en functies heen
var sql = "SELECT COALESCE(MIN(FAC_GEBRUIKER_PRS_LEVEL_READ), 9) pread"
+ ", COALESCE(MIN(FAC_GEBRUIKER_PRS_LEVEL_WRITE), 9) pwrite"
+ ", COALESCE(MIN(FAC_GEBRUIKER_ALG_LEVEL_READ), 9) aread"
+ ", COALESCE(MIN(FAC_GEBRUIKER_ALG_LEVEL_WRITE), 9) awrite"
var sql = "SELECT COALESCE(MIN(fac_gebruiker_prs_level_read), 9) pread"
+ ", COALESCE(MIN(fac_gebruiker_prs_level_write), 9) pwrite"
+ ", COALESCE(MIN(fac_gebruiker_alg_level_read), 9) aread"
+ ", COALESCE(MIN(fac_gebruiker_alg_level_write), 9) awrite"
+ " FROM fac_v_webgebruiker w"
+ " WHERE w.prs_perslid_key = " + this._prs_perslid_key
+ " AND w.fac_functie_key IN (" + result.autfunctionkeys.join(",") + ")";
@@ -1021,10 +1021,10 @@ Perslid.prototype.func_enabled_readit = function _func_enabled_readit(module, in
if (!multidisc)
{
var sql = "SELECT f.fac_functie_code, f.fac_functie_key, fac_functie_min_level"
+ ", COALESCE(MIN(FAC_GEBRUIKER_PRS_LEVEL_READ ), 9) FAC_GEBRUIKER_PRS_LEVEL_READ"
+ ", COALESCE(MIN(FAC_GEBRUIKER_PRS_LEVEL_WRITE), 9) FAC_GEBRUIKER_PRS_LEVEL_WRITE"
+ ", COALESCE(MIN(FAC_GEBRUIKER_ALG_LEVEL_READ ), 9) FAC_GEBRUIKER_ALG_LEVEL_READ"
+ ", COALESCE(MIN(FAC_GEBRUIKER_ALG_LEVEL_WRITE), 9) FAC_GEBRUIKER_ALG_LEVEL_WRITE"
+ ", COALESCE(MIN(fac_gebruiker_prs_level_read ), 9) fac_gebruiker_prs_level_read"
+ ", COALESCE(MIN(fac_gebruiker_prs_level_write), 9) fac_gebruiker_prs_level_write"
+ ", COALESCE(MIN(fac_gebruiker_alg_level_read ), 9) fac_gebruiker_alg_level_read"
+ ", COALESCE(MIN(fac_gebruiker_alg_level_write), 9) fac_gebruiker_alg_level_write"
+ " FROM fac_v_webgebruiker w, fac_functie f"
+ " WHERE w.prs_perslid_key = " + this._prs_perslid_key
+ " AND w.fac_functie_key = f.fac_functie_key"
@@ -1037,10 +1037,10 @@ Perslid.prototype.func_enabled_readit = function _func_enabled_readit(module, in
// TODO: voor leesrechten willen we misschien *optimistisch* controleren?
// Dan moeten we hieronder ook afzonderlijk de MIN bepalen per discipline
var sqlA = "SELECT f.fac_functie_code, f.fac_functie_key, fac_functie_min_level, ins_discipline_key"
+ ", COALESCE(MIN(FAC_GEBRUIKER_PRS_LEVEL_READ ), 9) FAC_GEBRUIKER_PRS_LEVEL_READ"
+ ", COALESCE(MIN(FAC_GEBRUIKER_PRS_LEVEL_WRITE), 9) FAC_GEBRUIKER_PRS_LEVEL_WRITE"
+ ", COALESCE(MIN(FAC_GEBRUIKER_ALG_LEVEL_READ ), 9) FAC_GEBRUIKER_ALG_LEVEL_READ"
+ ", COALESCE(MIN(FAC_GEBRUIKER_ALG_LEVEL_WRITE), 9) FAC_GEBRUIKER_ALG_LEVEL_WRITE"
+ ", COALESCE(MIN(fac_gebruiker_prs_level_read ), 9) fac_gebruiker_prs_level_read"
+ ", COALESCE(MIN(fac_gebruiker_prs_level_write), 9) fac_gebruiker_prs_level_write"
+ ", COALESCE(MIN(fac_gebruiker_alg_level_read ), 9) fac_gebruiker_alg_level_read"
+ ", COALESCE(MIN(fac_gebruiker_alg_level_write), 9) fac_gebruiker_alg_level_write"
+ " FROM fac_v_webgebruiker w, fac_functie f"
+ " WHERE w.prs_perslid_key = " + this._prs_perslid_key
+ " AND w.fac_functie_key = f.fac_functie_key"
@@ -1048,10 +1048,10 @@ Perslid.prototype.func_enabled_readit = function _func_enabled_readit(module, in
+ " GROUP BY f.fac_functie_code, f.fac_functie_key, fac_functie_min_level, ins_discipline_key"
sql = "SELECT fac_functie_code, fac_functie_key, fac_functie_min_level"
+ ", " + (checkOptimistic? "MIN" : "MAX") + "(FAC_GEBRUIKER_PRS_LEVEL_READ ) FAC_GEBRUIKER_PRS_LEVEL_READ"
+ ", " + (checkOptimistic? "MIN" : "MAX") + "(FAC_GEBRUIKER_PRS_LEVEL_WRITE) FAC_GEBRUIKER_PRS_LEVEL_WRITE"
+ ", " + (checkOptimistic? "MIN" : "MAX") + "(FAC_GEBRUIKER_ALG_LEVEL_READ ) FAC_GEBRUIKER_ALG_LEVEL_READ"
+ ", " + (checkOptimistic? "MIN" : "MAX") + "(FAC_GEBRUIKER_ALG_LEVEL_WRITE) FAC_GEBRUIKER_ALG_LEVEL_WRITE"
+ ", " + (checkOptimistic? "MIN" : "MAX") + "(fac_gebruiker_prs_level_read ) fac_gebruiker_prs_level_read"
+ ", " + (checkOptimistic? "MIN" : "MAX") + "(fac_gebruiker_prs_level_write) fac_gebruiker_prs_level_write"
+ ", " + (checkOptimistic? "MIN" : "MAX") + "(fac_gebruiker_alg_level_read ) fac_gebruiker_alg_level_read"
+ ", " + (checkOptimistic? "MIN" : "MAX") + "(fac_gebruiker_alg_level_write) fac_gebruiker_alg_level_write"
+ " FROM (" + sqlA + ")"
+ " WHERE ins_discipline_key IN (" + ins_discipline_key + ") "
+ " GROUP BY fac_functie_code, fac_functie_key, fac_functie_min_level"
@@ -1064,10 +1064,10 @@ Perslid.prototype.func_enabled_readit = function _func_enabled_readit(module, in
result.push({ fac_functie_code: oRs("fac_functie_code").Value,
autfunctionkey: oRs("fac_functie_key").Value,
fac_functie_min_level: oRs("fac_functie_min_level").Value,
PRSreadlevel : oRs("FAC_GEBRUIKER_PRS_LEVEL_READ").Value,
PRSwritelevel : oRs("FAC_GEBRUIKER_PRS_LEVEL_WRITE").Value,
ALGreadlevel : oRs("FAC_GEBRUIKER_ALG_LEVEL_READ").Value,
ALGwritelevel : oRs("FAC_GEBRUIKER_ALG_LEVEL_WRITE").Value
PRSreadlevel : oRs("fac_gebruiker_prs_level_read").Value,
PRSwritelevel : oRs("fac_gebruiker_prs_level_write").Value,
ALGreadlevel : oRs("fac_gebruiker_alg_level_read").Value,
ALGwritelevel : oRs("fac_gebruiker_alg_level_write").Value
});
oRs.MoveNext();
}