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

FSN#36111 Activiteit x discipline als subframe onder discipline

Browse Source 
svn path=/Website/trunk/; revision=28972
This commit is contained in:
Jos Groot Lipman
2016-04-17 09:53:28 +00:00
parent 3be09d36e2
commit d098e9938b
3 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
APPL/API2/model_res_activiteit_discipline.inc
View File

@@ -19,7 +19,6 @@ function model_res_activiteit_discipline()
this.records_name = "res_activiteitdisciplines"; this.records_name = "res_activiteitdisciplines";
this.record_name = "res_activiteitdiscipline"; this.record_name = "res_activiteitdiscipline";
this.fields = { this.fields = {
"id": { "id": {
"dbs": "res_activiteitdiscipline_key", "dbs": "res_activiteitdiscipline_key",
@@ -55,13 +54,6 @@ function model_res_activiteit_discipline()
}, },
"LOVinit": "", "LOVinit": "",
"filter": "exact" "filter": "exact"
},
"ins_discipline_min_level": {
"dbs": "ins_tab_discipline.ins_discipline_min_level",
"label": L("ins_discipline_min_level"),
"typ": "key",
"hidden_fld": true,
"LOV": L("ins_discipline_min_levelLOV")
} }
}; };
@@ -72,7 +64,6 @@ function model_res_activiteit_discipline()
this.list = { this.list = {
"columns": [ "columns": [
"id", "id",
"ins_discipline_min_level",
"res_discipline_key", "res_discipline_key",
"res_activiteit_key" "res_activiteit_key"
] ]
@@ -81,24 +72,16 @@ function model_res_activiteit_discipline()
"autosearch": true, "autosearch": true,
"filters": [ "filters": [
"res_discipline_key", "res_discipline_key",
"res_activiteit_key", "res_activiteit_key"
"ins_discipline_min_level"
] ]
}; };
this.autfunction = "WEB_RESMGT"; this.autfunction = "WEB_RESMGT";
this.record_title = L("res_activiteitdiscipline"); this.record_title = L("res_activiteitdiscipline");
this.records_title = L("res_activiteitdiscipline_m"); this.records_title = L("res_activiteitdiscipline_m");
this.edit = { modal: true }; this.edit = { modal: true };
this.REST_GET = generic_REST_GET(this);
this.gparams = {GET: { tables: ["ins_tab_discipline"],
wheres: ["res_activiteitdiscipline.res_discipline_key = ins_tab_discipline.ins_discipline_key"]
}
};
this.REST_GET = generic_REST_GET(this, this.gparams);
this.REST_POST = generic_REST_POST(this); this.REST_POST = generic_REST_POST(this);
this.REST_PUT = generic_REST_PUT(this); this.REST_PUT = generic_REST_PUT(this);
this.REST_DELETE = generic_REST_DELETE(this, {}); this.REST_DELETE = generic_REST_DELETE(this, {});

9
APPL/API2/model_res_discipline.inc
View File

@@ -14,6 +14,7 @@
%> %>
<!-- #include file="model_res_disc_params.inc" --> <!-- #include file="model_res_disc_params.inc" -->
<!-- #include file="./model_res_activiteit_discipline.inc" -->
<% <%
function model_res_discipline(disc_key, params) function model_res_discipline(disc_key, params)
{ {
@@ -111,6 +112,14 @@ _model_res_discipline = // Internal only
model: model_res_disc_params, model: model_res_disc_params,
joinfield: "res_ins_discipline_key" joinfield: "res_ins_discipline_key"
}, },
includes : {
"disciplines": {
"model": new model_res_activiteit_discipline(),
"joinfield": "res_discipline_key",
"enable_update": true
}
},
"soft_delete": "ins_discipline_verwijder", "soft_delete": "ins_discipline_verwijder",
"autfunction": "WEB_RESMGT", "autfunction": "WEB_RESMGT",
"record_title": L("res_v_res_catalogus"), "record_title": L("res_v_res_catalogus"),

13
APPL/MGT/res_activiteit_discipline.asp
View File

@@ -1,13 +0,0 @@
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../api2/model_res_activiteit_discipline.inc" -->
<%
scaffolding(new model_res_activiteit_discipline(),
{
"search": {
autosearch: true
}
});
%>