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

FSN#34135 API2 error bij include van reservableequipment

Browse Source 
svn path=/Website/trunk/; revision=30324
This commit is contained in:
Jos Groot Lipman
2016-08-16 14:21:20 +00:00
parent 23fc9699a0
commit 4d00690831
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_reservableequipment.inc
View File

@@ -168,7 +168,7 @@ model_reservableequipment =
// TODO: Add authorization
var query = api2.sqlfields(params, model_reservableequipment);
query.wheres.push("res_deel_verwijder IS NULL");
query.wheres.push(model_reservableequipment._autorized_discs_sql("res_discipline_key"));
query.wheres.push(model_reservableequipment._autorized_discs_sql("res_deel.res_discipline_key"));
var wheres = api2.sqlfilter(params, model_reservableequipment);
query.wheres = query.wheres.concat(wheres);

4
APPL/API2/model_reservablerooms.inc
View File

@@ -113,6 +113,8 @@ model_reservablerooms =
single_only: true, // Zodat je alleen de mogelijke objecten van <20><>n ruimte kunt opvragen (performance)
joinfunction: function (params) // Alleen objecten die zijn toegestaan in deze ruimte
{
var urole = "fe"; // TODO: Moet echt niet ter zake doen
var autfunction = urole == "fe"? "WEB_RESUSE" : "WEB_RESMAN";
var params = { res_ruimte_key : params.filter.id, // die is er dankzij single_only
select_fields : "r.res_deel_key",
//sdisc : p_sdisc, // TODO
@@ -191,7 +193,7 @@ model_reservablerooms =
// TODO: Add authorization
var query = api2.sqlfields(params, model_reservablerooms );
query.wheres.push(model_reservablerooms._autorized_discs_sql("res_discipline_key"));
query.wheres.push(model_reservablerooms._autorized_discs_sql("res_ruimte.res_discipline_key"));
query.tables.push("res_alg_ruimte");