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

SCF: Iets flexibelere transit parameter

Browse Source 
svn path=/Website/trunk/; revision=28582
This commit is contained in:
Jos Groot Lipman
2016-03-22 14:42:57 +00:00
parent 4bd0b479b8
commit 44165f0a9b
13 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/MGT/alg_kenmerk.asp
View File

@@ -41,8 +41,7 @@ scaffolding(this_model,
"requires": { js: ["./mgt_srtkenmerk.js"] }
},
"print": {},
"transit": { name: "alg_kenmerk_niveau", val: niveau}
"transit": { "alg_kenmerk_niveau": niveau }
});

3
APPL/MGT/fac_import_app.asp
View File

@@ -41,8 +41,7 @@ scaffolding(this_model,
}
},
"transit": {
"name": "gen",
"val": generic
"gen": generic
},
"print": {}
});

2
APPL/MGT/ins_kenmerk.asp
View File

@@ -23,6 +23,6 @@ scaffolding(this_model,
"js": ["../mgt/srtinstallatieselector.js"]
}
},
"transit": {name: "inspectie", val: kenmerk_params.niveau}
"transit": { "inspectie": kenmerk_params.niveau }
});
%>

3
APPL/MGT/prs_kenmerk.asp
View File

@@ -46,8 +46,7 @@ scaffolding(this_model,
},
"print": {},
"transit": {
"name": "prs_kenmerk_niveau",
"val": niveau
"prs_kenmerk_niveau": niveau
}
});

13
APPL/SCF/scaffolding.inc
View File

@@ -59,7 +59,7 @@ function scaffolding(model, scf_params)
model = model.includes[imodel].model;
if (typeof model == "function") // Nieuwe stijl is het een function. Even compatible.
model = new model();
scf_params.transit = { name: "model", val: imodel };
scf_params.transit = { "model": imodel };
}
// Originele URL voor IIRF rewrite
@@ -601,4 +601,15 @@ function scf_GROUP_RADIO(pgroup, pclass, pvalue, params)
Response.Write("</tr>");
}
function scf_transit2url(scf_params)
{
var transit = "";
if ("transit" in scf_params)
{
var tdata = scf_params.transit;
for (trans in tdata)
transit = "&" + trans + "=" + safe.url(tdata[trans]);
}
return transit;
}
%>

4
APPL/SCF/scaffolding_edit.inc
View File

@@ -25,9 +25,7 @@ function scaffolding_edit(model, scf_params)
if (model.edit && "requires" in model.edit) // Voor het included model.
FCLTHeader.Requires(model.edit.requires);
var transit = "";
if ("transit" in scf_params)
transit = "&" + scf_params.transit.name + "=" + safe.url(scf_params.transit.val);
var transit = scf_transit2url(scf_params);
if (scf_params.incsetting)
transit += "&" + scf_params.incsetting.joinfield + "=" + getQParamInt(scf_params.incsetting.joinfield);

4
APPL/SCF/scaffolding_list.inc
View File

@@ -18,9 +18,7 @@ function scaffolding_list(model, scf_params)
scf_params.list.groupby = scf_params.list.groupby || [];
scf_params.list.orderby = scf_params.list.orderby || [];
var transit = "";
if ("transit" in scf_params)
transit = "&" + scf_params.transit.name + "=" + safe.url(scf_params.transit.val);
var transit = scf_transit2url(scf_params);
var cols = getQParamArray("columns", []);
if (cols.length && cols[0])

2
APPL/SCF/scaffolding_m.inc
View File

@@ -45,7 +45,7 @@ function scaffolding(model, scf_params)
if (model.includes && imodel in model.includes)
{
model = model.includes[imodel].model;
scf_params.transit = { name: "model", val: imodel };
scf_params.transit = { "model": imodel };
}
// Originele URL voor IIRF rewrite

4
APPL/SCF/scaffolding_m_edit.inc
View File

@@ -21,9 +21,7 @@ function scaffolding_m_edit(model, scf_params)
if ("requires" in scf_params.edit)
FCLTHeader.Requires(scf_params.edit.requires);
var transit = "";
if ("transit" in scf_params)
transit = "&" + scf_params.transit.name + "=" + safe.url(scf_params.transit.val);
var transit = scf_transit2url(scf_params);
var key = getQParamInt("id", -1);
if (key > 0)

4
APPL/SCF/scaffolding_m_list.inc
View File

@@ -17,9 +17,7 @@ function scaffolding_m_list(model, scf_params)
scf_params.list.columns = scf_params.list.columns || [];
scf_params.list.groupby = scf_params.list.groupby || [];
var transit = "";
if ("transit" in scf_params)
transit = "&" + scf_params.transit.name + "=" + safe.url(scf_params.transit.val);
var transit = scf_transit2url(scf_params);
var cols = getQParamArray("columns", []);
if (cols.length && cols[0])

14
APPL/SCF/scaffolding_search.inc
View File

@@ -158,9 +158,15 @@ function scaffolding_search(model, scf_params)
Response.Write("<input type='hidden' name='" + fld + "' value='" + safe.htmlattr(defaults[fld]) + "'>");
}
}
if (scf_params.transit) { %>
<input type='hidden' name='<%=scf_params.transit.name%>' value='<%=safe.htmlattr(scf_params.transit.val)%>'>
<% }
if (scf_params.transit)
{
var tdata = scf_params.transit;
for (trans in tdata) {
%>
<input type='hidden' name='<%=trans%>' value='<%=safe.htmlattr(tdata[trans])%>'>
<% }
}
var est_title = "";
if ("estimated_rows" in model)
est_title = " <em style='font-size:10px'>estimated {0} rows as of {1}</em>".format(model.estimated_rows, toDateTimeString(model.last_analyzed));
@@ -171,7 +177,7 @@ function scaffolding_search(model, scf_params)
{
for (var i=0; i < scf_params.search.labels.length; i++)
{
ROFIELDTR("fldtxt", scf_params.search.labels[i].lbl, scf_params.search.labels[i].txt);
ROFIELDTR("fldtxt", scf_params.search.labels[i].lbl, scf_params.search.labels[i].txt, { suppressEmpty: true });
}
}

4
APPL/SCF/scaffolding_show.inc
View File

@@ -22,9 +22,7 @@ function scaffolding_show(model, scf_params)
if ("requires" in scf_params.show)
FCLTHeader.Requires(scf_params.show.requires);
var transit = "";
if ("transit" in scf_params)
transit = "&" + scf_params.transit.name + "=" + safe.url(scf_params.transit.val);
var transit = scf_transit2url(scf_params);
var key = getQParamInt("id");
var xxx_params = { filter: { id: key } };

4
APPL/SCF/scaffolding_wrap.inc
View File

@@ -17,9 +17,7 @@ function scaffolding_wrap(model, scf_params)
{
scf_params.wrap = scf_params.wrap || {};
var transit = "";
if ("transit" in scf_params)
transit = "&" + scf_params.transit.name + "=" + safe.url(scf_params.transit.val);
var transit = scf_transit2url(scf_params);
var key = getQParam("id", -1);