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

FSN#37018 Gebreken in volgnummer autorisatie op kenmerken

Browse Source 
svn path=/Website/trunk/; revision=30761
This commit is contained in:
Erik Groener
2016-09-19 14:24:01 +00:00
parent 69b2d2511d
commit 8f62975a7f
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
APPL/MLD/mld_edit_melding.asp
View File

@@ -921,10 +921,12 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
}
ROFIELDTR("fld", L("lcl_mld_meldbron_nr"), mld_melding.meldbron_nr, {suppressEmpty: true});
var params = { infoPointer: { Url: "appl/shared/status_info.asp?mld_key=" + mld_key + "&urole=" + urole,
Title: L("lcl_status_details") + " " + mld_key
}
}
var params = {};
if (!frontend || !S("mld_hide_fe_tracking"))
params = { infoPointer: { Url: "appl/shared/status_info.asp?mld_key=" + mld_key + "&urole=" + urole,
Title: L("lcl_status_details") + " " + mld_key
}
}
ROFIELDTR("fld", L("lcl_mld_status"), mld_melding.mld_status_str, params);
if (mld_melding.rsv_ruimte_key && mld_melding.res_key)
@@ -1052,18 +1054,18 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
"fld" + ((mld_melding.subject == 2 && (this_mld.canOmsChange || mld_key < 0) && !txtreado)? " required" : ""), /* prepared, 3=future value */
L("lcl_mld_subject"),
mld_melding.mld_onderwerp,
{html: (!(this_mld.canOmsChange || mld_key < 0) || txtreado? " readonly" : "")})
}
{html: (!(this_mld.canOmsChange || mld_key < 0) || txtreado? " readonly" : "")})
}
if (mld_melding.freetext != 0)
{
// Complaint text description
// Complaint text description
RWTEXTAREATR("melding_omschrijving",
"fldtxt" + ((mld_melding.freetext == 2 && (this_mld.canOmsChange || mld_key < 0) && !txtreado)? " required" : ""),
L("lcl_mld_inf_Omschrijving"),
mld_melding.mld_omschr,
{html: "rows='5'" + (!(this_mld.canOmsChange || mld_key < 0) || txtreado? " readonly" : "")});
}
BLOCK_END();

9
APPL/MLD/mld_list.inc
View File

@@ -721,6 +721,14 @@ function mld_list (pautfunction, params)
return result;
}
function fnrowFlexParams(oRs)
{
var disc_key = oRs("ins_discipline_key").Value;
var this_mld = mld.func_enabled_mld(disc_key, "D");
var flexParams = { readman: this_mld.readman, readuse: this_mld.readuse};
return flexParams;
}
var buttons = [];
if (params.rsv_ruimte_key)
buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
@@ -757,6 +765,7 @@ function mld_list (pautfunction, params)
flexGroupId: "mld_stdmelding_key", // Kenmerken zijn ook op stdmelding niveau gedefinieerd
flexParentGroupId: "ins_discipline_key", // Kenmerken zijn ook op stdmelding niveau gedefinieerd
flexChangeNiveau: "S", // Niveau voor extra headers (met kenmerken) in excel
flexParams: fnrowFlexParams,
filterParams: params,
outputmode: outputmode,
title: L("lcl_complains"),

4
APPL/MLD/mld_show_melding.asp
View File

@@ -417,7 +417,9 @@ function parentButton()
}
ROFIELDTR("fld", L("lcl_mld_meldbron_nr"), mld_melding.meldbron_nr, {suppressEmpty: true});
var params = { infoPointer: { Url: "appl/shared/status_info.asp?mld_key=" + mld_key + "&urole=" + urole,
var params = {};
if (!frontend || !S("mld_hide_fe_tracking"))
params = { infoPointer: { Url: "appl/shared/status_info.asp?mld_key=" + mld_key + "&urole=" + urole,
Title: L("lcl_status_details") + " " + mld_key
}
}

4
APPL/Shared/resultset_flex.inc
View File

@@ -356,7 +356,9 @@ function getSqlFlex(flexModule, flexId, flexParams)
+ ", mld_kenmerk k"
+ " WHERE sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key"
+ " AND km.mld_kenmerk_key = k.mld_kenmerk_key"
+ " AND sk.mld_srtkenmerk_verwijder IS NULL";
+ " AND sk.mld_srtkenmerk_verwijder IS NULL"
+ (!flexParams.readman? " AND k.mld_kenmerk_volgnummer >= 100":"")
+ (!flexParams.readuse? " AND k.mld_kenmerk_volgnummer <= 100":"");
break;
}