| ");
- if (flevel & 4) // PRS
+ if (!advanced)
{
- if (prsread == prswrite)
- {
- radioTD("prsread", L("lcl_prs_organisatie"), prsLOV, prsread);
- }
- else
- {
- radioTD("prsread", L("fac_gebruiker_prs_level_read"), prsLOV, prsread);
- radioTD("prswrite", L("fac_gebruiker_prs_level_write"), prsLOV, prswrite);
- }
+ Response.Write("");
+ var cparams = {};
+ if (flevel > 1)
+ cparams.posthtml = " ".format(api2.splitLOV(L("fac_functie_min_levelLOV"))[flevel]);
+ RWCHECKBOXTR("allread", "fldcheck", L("fac_gebruiker_toegang"), algread==9?0:1, cparams)
}
- if (flevel & 8) // ALG
+ else
{
- if (flevel & 8)
- Response.Write("| | ")
- if (algread == algwrite)
+ Response.Write(" ");
+ if (!(flevel & (4 | 8))) // niet gescoped
{
- radioTD("algread", L("lcl_place"), algLOV, algread);
+ if (flevel & 2) // Schrijfrechten
+ Response.Write(" | " + L("fac_gebruiker_lezen") + " | " + L("fac_gebruiker_schrijven") + " |
|---|
");
+ radioTD("algread", jnLOV, algread);
+ if (flevel & 2) // Schrijfrechten
+ radioTD("algwrite", jnLOV, algwrite);
}
else
{
- radioTD("algread", L("fac_gebruiker_alg_level_read"), algLOV, algread);
- radioTD("algwrite", L("fac_gebruiker_alg_level_write"), algLOV, algwrite);
- }
- }
- if ((flevel & (4 + 8)) == 0)
- {
- if (flevel == 1)
- radioTD("algread", L("fac_gebruiker_toegang"), jnLOV, algread);
- else
- {
- radioTD("algread", L("fac_gebruiker_lezen"), jnLOV, algread);
- radioTD("algwrite", L("fac_gebruiker_schrijven"), jnLOV, algwrite);
- }
+ if (flevel & (4 | 8)) // scope kopjes
+ {
+ Response.Write("");
+ var spanner = "";
+ if (flevel & 2) // read/write kopjes
+ spanner = " colspan='2' style='text-align:center'";
+ if (flevel & 4)
+ Response.Write("" + L("lcl_prs_organisatie") + "");
+ if (flevel & 8)
+ Response.Write("" + L("lcl_place") + "");
+ Response.Write(" ");
+ }
+ if (flevel & 2) // read/write kopjes
+ {
+ Response.Write("");
+ Response.Write("| " + L("fac_gebruiker_lezen") + " | " + L("fac_gebruiker_schrijven") + " | ");
+ if ((flevel & 4) && (flevel & 8))
+ Response.Write("" + L("fac_gebruiker_lezen") + " | " + L("fac_gebruiker_schrijven") + " | ");
+ Response.Write(" ");
+ }
+ if (flevel & 4) // PRS
+ {
+ radioTD("prsread", prsLOV, prsread);
+ if (flevel & 2) // Schrijfrechten
+ radioTD("prswrite", prsLOV, prswrite);
+ }
+ if (flevel & 8) // ALG
+ {
+ radioTD("algread", algLOV, algread);
+ if (flevel & 2) // Schrijfrechten
+ radioTD("algwrite", algLOV, algwrite);
+ }
+ }
+ Response.Write("
| ");
}
- Response.Write("
|
");
BLOCK_END();
buttons = [];
+ if (flevel > 1)
+ {
+ if (advanced)
+ {
+ if (!no_simpel)
+ buttons.push ( {title: L("lcl_auth_simple"), action:"auth_advanced(0)" } );
+ }
+ else
+ buttons.push ( {title: L("lcl_auth_advanced"), action:"auth_advanced(1)" } );
+ }
buttons.push({ title: L("lcl_submit"), action: "grp_submit()" });
buttons.push({ title: L("lcl_cancel"), action: "gen_cancel()" });
diff --git a/APPL/MGT/fac_edit_groeprechten_save.asp b/APPL/MGT/fac_edit_groeprechten_save.asp
new file mode 100644
index 0000000000..ca45ec3725
--- /dev/null
+++ b/APPL/MGT/fac_edit_groeprechten_save.asp
@@ -0,0 +1,101 @@
+<%@language = "javascript" %>
+<% /*
+ $Revision$
+ $Id$
+
+ File: fac_edit_groeprechten_save.asp.asp
+ Description: Het echte bewaren van een autorisatie
+ Parameters: fac_groep
+ fac_functie
+ ins_discipline optioneel
+ simplemode optioneel, 1 voor alleen 'Toegang' vinkje
+ Context: Vanuit fac_edit_groeprechten.asp
+
+*/
+var JSON_Result = true;
+%>
+
+
+
+<%
+protectRequest.validateToken();
+
+user.checkAutorisation("WEB_PRSSYS"); // TODO Minder scherp
+
+var groep_key = getQParamInt("fac_groep");
+var functie_key = getQParamInt("fac_functie");
+var disc_key = getQParamInt("ins_discipline", -1);
+var gr_key = getQParamInt("gr_key", -1);
+
+var simple_mode = getFParamInt("simple_mode", 0) == 1;
+if (simple_mode)
+{
+ var lvl = (getFParam("allread", "off") == 'on')?-1:9;
+ var prsread = lvl;
+ var prswrite = lvl;
+ var algread = lvl;
+ var algwrite = lvl;
+}
+else
+{
+ var prsread = getFParamInt("prsread", -2);
+ var prswrite = getFParamInt("prswrite", -2);
+ var algread = getFParamInt("algread", -2);
+ var algwrite = getFParamInt("algwrite", -2);
+}
+
+var level = Oracle.Get("fac_functie_min_level", "fac_functie", functie_key);
+if (!(level & 2)) // geen aparte schrijfrechten
+{
+ prswrite = -1;
+ algwrite = -1;
+}
+if (level & ( 4 | 8))
+{
+ if (!(level & 4)) // geen PRS scope
+ {
+ prsread = -1;
+ prswrite = algwrite < 9?-1:9; // waarschijnlijk don't care
+ }
+ if (!(level & 8)) // geen ALG scope
+ {
+ algread = -1;
+ algwrite = prswrite < 9?-1:9; // waarschijnlijk don't care
+ }
+}
+if (algread == 9 || prsread == 9) // Geen rechten (over)
+{
+ if (gr_key > 0)
+ {
+ var sql = "DELETE FROM fac_groeprechten WHERE fac_groeprechten_key = " + gr_key;
+ Oracle.Execute(sql);
+ }
+}
+else
+{
+ var fields = [ { dbs: "fac_gebruiker_prs_level_read", typ: "number", val: prsread },
+ { dbs: "fac_gebruiker_prs_level_write", typ: "number", val: prswrite },
+ { dbs: "fac_gebruiker_alg_level_read", typ: "number", val: algread },
+ { dbs: "fac_gebruiker_alg_level_write", typ: "number", val: algwrite }
+ ]
+ if (gr_key > -1)
+ {
+ var sql = buildUpdate("fac_groeprechten", fields)
+ + " fac_groeprechten_key = " + gr_key;
+ Oracle.Execute(sql);
+ }
+ else
+ {
+ fields.push({ dbs: "fac_functie_key", typ: "key", val: functie_key },
+ { dbs: "fac_groep_key", typ: "key", val: groep_key },
+ { dbs: "ins_discipline_key", typ: "key", val: disc_key }
+ );
+ var grpIns = buildInsert("fac_groeprechten", fields);
+ Oracle.Execute(grpIns.sql);
+ }
+}
+var result = {success: true };
+
+Response.Write(JSON.stringify(result));
+Response.End;
+%>
\ No newline at end of file
diff --git a/APPL/MGT/fac_functie.asp b/APPL/MGT/fac_functie.asp
index 02f7ae889e..978fda9391 100644
--- a/APPL/MGT/fac_functie.asp
+++ b/APPL/MGT/fac_functie.asp
@@ -9,11 +9,11 @@
var disc_key = getQParamInt("ins_discipline", -1);
var model = new model_fac_functie(null, { groep_key: groep_key, disc_key: disc_key });
- settings.overrule_setting("qp_maxrows", 250); // Toon alle 186 (2015.6) functies direkt
+ settings.overrule_setting("qp_maxrows", 250); // Toon alle 186 (DB28) functies direct
function fnrowData(oRs)
{
- var funcdisc = oRs.Fields("discipline").Value;
+ var funcdisc = oRs.Fields("discipline").Value.id;
var data = {funcdisc: funcdisc, groep_key: groep_key, disc_key: disc_key};
return JSON.stringify(data);
}
@@ -54,28 +54,28 @@
};
if (groep_key > 0)
{
- scf_params.search.labels.push({ "lbl": L("fac_groep"), "txt" : Oracle.Get("fac_groep_omschrijving", "fac_groep", groep_key)});
+ var groep_desc = Oracle.Get("fac_groep_omschrijving", "fac_groep", groep_key);
+ scf_params.search.title = groep_desc;
+ scf_params.search.labels.push({ "lbl": L("fac_groep"), "txt" : groep_desc});
scf_params.search.labels.push({ "lbl": L("fac_groep_opmerking"), "txt" : Oracle.Get("fac_groep_opmerking", "fac_groep", groep_key)});
- scf_params.list.columns =
- scf_params.list.columns.concat([
+ scf_params.list.columns.push(
"authorization.ins_discipline",
"authorization.prs_level_read",
"authorization.prs_level_write",
"authorization.alg_level_read",
"authorization.alg_level_write"
- ]);
+ );
}
if (disc_key > 0)
{
scf_params.search.labels.push({ "lbl": L("ins_discipline_key"), "txt" : Oracle.Get("ins_discipline_omschrijving", "ins_tab_discipline", "ins_discipline_key", disc_key)});
- scf_params.list.columns =
- scf_params.list.columns.concat([
+ scf_params.list.columns.push(
"authorization.fac_groep",
"authorization.prs_level_read",
"authorization.prs_level_write",
"authorization.alg_level_read",
"authorization.alg_level_write"
- ]);
+ );
}
scaffolding(model, scf_params);
%>
diff --git a/APPL/MGT/fac_functie.js b/APPL/MGT/fac_functie.js
index 227cd43b82..83816cccce 100644
--- a/APPL/MGT/fac_functie.js
+++ b/APPL/MGT/fac_functie.js
@@ -16,7 +16,7 @@ function edit_rechten(row)
else if (funData.groep_key > 0)
{
var url = "fac_edit_groeprechten.asp?fac_groep={0}&fac_functie={1}".format(funData.groep_key, functie_key);
- FcltMgr.openModalDetail(url, L("fac_groeprechten"));
+ FcltMgr.openModalDetail(url, L("fac_groeprechten"), { callback: FcltCallbackRefresh });
}
else // eerst nog een groep erbij kiezen
{
diff --git a/APPL/MGT/fac_groep.asp b/APPL/MGT/fac_groep.asp
index 8023f9c072..5a6592e137 100644
--- a/APPL/MGT/fac_groep.asp
+++ b/APPL/MGT/fac_groep.asp
@@ -65,15 +65,30 @@
if (functie_key > 0)
{
- scf_params.search.labels.push({ "lbl": L("fac_functie"), "txt" : Oracle.Get("fac_functie_omschrijving", "fac_functie", functie_key)});
- scf_params.list.columns =
- scf_params.list.columns.concat([
- //"authorization.ins_discipline",
- "authorization.prs_level_read",
- "authorization.prs_level_write",
- "authorization.alg_level_read",
- "authorization.alg_level_write"
- ]);
+ var func_desc = Oracle.Get("fac_functie_omschrijving", "fac_functie", functie_key);
+ scf_params.search.title = func_desc;
+ scf_params.search.labels.push({ "lbl": L("fac_functie"), "txt" : func_desc });
+ scf_params.search.labels.push({ "lbl": L("fac_functie_info"), "txt" : Oracle.Get("fac_functie_info", "fac_functie", functie_key)});
+
+ model.level = Oracle.Get("fac_functie_min_level", "fac_functie", functie_key);
+ if (model.level & 4)
+ {
+ scf_params.list.columns.push("authorization.prs_level_read");
+ if (model.level & 2)
+ scf_params.list.columns.push("authorization.prs_level_write");
+ }
+ if (model.level & 8)
+ {
+ scf_params.list.columns.push("authorization.alg_level_read")
+ if (model.level & 2)
+ scf_params.list.columns.push("authorization.alg_level_write");
+ }
+ if (!(model.level & (4 | 8)))
+ {
+ scf_params.list.columns.push("authorization.prs_level_read");
+ if (model.level & 2) // Schrijfrechten
+ scf_params.list.columns.push("authorization.alg_level_write");
+ }
}
if (disc_key > 0)
{
diff --git a/APPL/MGT/fac_groep.js b/APPL/MGT/fac_groep.js
index 9da8935178..ba60f3e257 100644
--- a/APPL/MGT/fac_groep.js
+++ b/APPL/MGT/fac_groep.js
@@ -16,7 +16,7 @@ function edit_rechten(row)
else if (grpData.functie_key > 0)
{
var url = "fac_edit_groeprechten.asp?fac_groep={0}&fac_functie={1}&ins_discipline={2}".format(groep_key, grpData.functie_key, grpData.disc_key);
- FcltMgr.openModalDetail(url, L("fac_groeprechten"));
+ FcltMgr.openModalDetail(url, L("fac_groeprechten"), { callback: FcltCallbackRefresh });
}
else // eerst nog een functie erbij kiezen
{
diff --git a/APPL/MGT/ins_tab_discipline.asp b/APPL/MGT/ins_tab_discipline.asp
index a863872d0a..2c62378604 100644
--- a/APPL/MGT/ins_tab_discipline.asp
+++ b/APPL/MGT/ins_tab_discipline.asp
@@ -75,16 +75,31 @@
if (groep_key > 0 && functie_key > 0)
{
- scf_params.search.labels.push({ "lbl": L("fac_groep"), "txt" : Oracle.Get("fac_groep_omschrijving", "fac_groep", groep_key)});
+ var groep_desc = Oracle.Get("fac_groep_omschrijving", "fac_groep", groep_key);
+ var func_desc = Oracle.Get("fac_functie_omschrijving", "fac_functie", functie_key);
+ scf_params.search.title = groep_desc + "/" + func_desc;
+ scf_params.search.labels.push({ "lbl": L("fac_groep"), "txt" : groep_desc });
scf_params.search.labels.push({ "lbl": L("fac_groep_opmerking"), "txt" : Oracle.Get("fac_groep_opmerking", "fac_groep", groep_key)});
- scf_params.search.labels.push({ "lbl": L("fac_functie"), "txt" : Oracle.Get("fac_functie_omschrijving", "fac_functie", functie_key)});
- scf_params.list.columns =
- scf_params.list.columns.concat([
- "authorization.prs_level_read",
- "authorization.prs_level_write",
- "authorization.alg_level_read",
- "authorization.alg_level_write"
- ]);
+ scf_params.search.labels.push({ "lbl": L("fac_functie"), "txt" : func_desc});
+ scf_params.search.labels.push({ "lbl": L("fac_functie_info"), "txt" : Oracle.Get("fac_functie_info", "fac_functie", functie_key)});
+ if (model.level & 4)
+ {
+ scf_params.list.columns.push("authorization.prs_level_read");
+ if (model.level & 2)
+ scf_params.list.columns.push("authorization.prs_level_write");
+ }
+ if (model.level & 8)
+ {
+ scf_params.list.columns.push("authorization.alg_level_read")
+ if (model.level & 2)
+ scf_params.list.columns.push("authorization.alg_level_write");
+ }
+ if (!(model.level & (4 | 8)))
+ {
+ scf_params.list.columns.push("authorization.prs_level_read");
+ if (model.level & 2) // Schrijfrechten
+ scf_params.list.columns.push("authorization.alg_level_write");
+ }
}
scaffolding(model, scf_params);
diff --git a/APPL/MGT/ins_tab_discipline.js b/APPL/MGT/ins_tab_discipline.js
index 01c22b2f92..2db0b1d2a7 100644
--- a/APPL/MGT/ins_tab_discipline.js
+++ b/APPL/MGT/ins_tab_discipline.js
@@ -11,7 +11,7 @@ function edit_rechten(row)
if (grpData.functie_key > 0 && grpData.groep_key)
{
var url = "fac_edit_groeprechten.asp?fac_groep={0}&fac_functie={1}&ins_discipline={2}".format(grpData.groep_key, grpData.functie_key, disc_key);
- FcltMgr.openModalDetail(url, L("fac_groeprechten"));
+ FcltMgr.openModalDetail(url, L("fac_groeprechten"), { callback: FcltCallbackRefresh });
}
else if (grpData.functie_key > 0)
{
diff --git a/APPL/MGT/mgt_tools.inc b/APPL/MGT/mgt_tools.inc
index d05aa801ad..9f2e4cc6f6 100644
--- a/APPL/MGT/mgt_tools.inc
+++ b/APPL/MGT/mgt_tools.inc
@@ -306,7 +306,7 @@ function buildAlgLevelLOV()
+ ";1;" + L("lcl_district")
+ ";2;" + L("lcl_location")
+ ";3;" + L("lcl_building")
- + ";4;" + L("lcl_building")
+ + ";4;" + L("lcl_floor")
+ ";5;" + L("lcl_room")
+ ";9;" + L("fac_functie_auth_none");
return AlgLevelLOV;
diff --git a/APPL/SCF/scaffolding_search.inc b/APPL/SCF/scaffolding_search.inc
index 8faac65076..e59087d65e 100644
--- a/APPL/SCF/scaffolding_search.inc
+++ b/APPL/SCF/scaffolding_search.inc
@@ -170,6 +170,8 @@ function scaffolding_search(model, scf_params)
var est_title = "";
if ("estimated_rows" in model)
est_title = "