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

FSN#36820 Achteraf sleutel aan sleutelset toevoegen lukt niet

Browse Source 
svn path=/Website/branches/v2016.1/; revision=29697
This commit is contained in:
Erik Groener
2016-06-13 11:19:34 +00:00
parent f8e66cea68
commit 0643f988aa
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/INS/ins_edit_deel.asp
View File

@@ -641,7 +641,8 @@ var uitvoertijd_eenheid;
{urlParam: "disc_key", field: "disc"}],
extraParamField: "binding",
extracode: "B",
readonly: (ins_key > 0 || copy) || !this_ins.canChangeAlg,
module: module,
readonly: (ins_key > 0 || copy || module == "SLE") || !this_ins.canChangeAlg,
required: true
});

7
APPL/Shared/Suggest/SuggestSrtdeel.asp
View File

@@ -33,16 +33,17 @@ var srtgroep_key = getQParamInt("srtgroep_key", -1);
var module = getQParamSafe("module", "INS");
var extracode = getQParam("extracode", "");
var filtcode = getQParam("filtcode", "");
var module = (orgmodule == "SLE" ? "INS" : orgmodule);
if (module != "INS" && module != "BES")
shared.internal_error(L("lcl_obj_bad_value") + " module={0}.".format(module));
if (orgmodule != "INS" && orgmodule != "BES" && orgmodule != "SLE")
shared.internal_error(L("lcl_obj_bad_value") + " module={0}.".format(orgmodule));
var chars = chars.replace(/\*/g,"%");
var params = { autfunction: autfunction,
disc_key: disc_key,
srtgroep_key: srtgroep_key,
module: module };
module: orgmodule };
var filtClause = getFiltClauseSrtdeel(filtcode, params);
var extraInf = getExtraInfSrtdeel(extracode, module);

13
APPL/Shared/Suggest/srtdeelFilter.inc
View File

@@ -15,18 +15,21 @@
function getFiltClauseSrtdeel(pfiltcode, params)
{
var lfiltClause = {from: "", where: ""};
var module = params.module || "INS"; // geldige waarden: INS, BES
var orgmodule = params.module || "INS"; // geldige waarden: INS, BES, SLE
var module = (orgmodule == "SLE" ? "INS" : orgmodule);
if (module != "INS" && module != "BES")
shared.internal_error(L("lcl_obj_bad_value") + " module={0}.".format(module));
if (orgmodule != "INS" && orgmodule != "BES" && orgmodule != "SLE")
shared.internal_error(L("lcl_obj_bad_value") + " module={0}.".format(orgmodule));
if (params.module != "")
{
lfiltClause.from = ", " + module + "_discipline id";
lfiltClause.where = " AND sg.ins_discipline_key = id.ins_discipline_key"
+ " AND id.ins_discipline_module = " + safe.quoted_sql(module)
+ (module == "INS"
? " AND sg.ins_srtgroep_key NOT IN (" + S("sle_ins_srt_groep_key") + ", " + S("cil_ins_srt_groep_key") + ")"
+ (orgmodule == "INS" || orgmodule == "SLE"
? " AND sg.ins_srtgroep_key "
+ (orgmodule == "INS" ? "NOT" : "")
+ " IN (" + S("sle_ins_srt_groep_key") + ", " + S("cil_ins_srt_groep_key") + ")"
: ""
);
}

7
APPL/Shared/srtdeelselector.inc
View File

@@ -35,10 +35,11 @@ function FCLTsrtdeelselector(fieldName, objectName, params)
var lsrtdeelName = (device.test(device.supportsPlaceholder) ? "" : lwhenEmpty);
var lextraInit = "";
var filtClause = getFiltClauseSrtdeel(params.filtercode, params);
var module = params.module || "INS"; // geldige waarden: INS, BES
var orgmodule = params.module || "INS"; // geldige waarden: INS, BES, SLE
var module = (orgmodule == "SLE" ? "INS" : orgmodule); // module SLE wordt verder behandled als INS.
if (module != "INS" && module != "BES")
shared.internal_error(L("lcl_obj_bad_value") + " module={0}.".format(module));
if (orgmodule != "INS" && orgmodule != "BES" && orgmodule != "SLE")
shared.internal_error(L("lcl_obj_bad_value") + " module={0}.".format(orgmodule));
sql = "SELECT COUNT(distinct sd." + module + "_srtdeel_key) aantal"
+ " FROM " + module + "_srtdeel sd"