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

FCLT#57331 Uitsluiten mld_flag_on_fenote en mld_flag_on_bonote iets scherper

Browse Source 
svn path=/Website/branches/v2019.1/; revision=42005
This commit is contained in:
Jos Groot Lipman
2019-04-09 07:45:20 +00:00
parent 3e72b4f8f6
commit 475c52c387
7 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/MLD/mld.inc
View File

@@ -6245,7 +6245,17 @@ mld = {
+ " (SELECT fac_functie_key FROM fac_v_webgebruiker"
+ " WHERE prs_perslid_key = " + user_key + "))"
+ sqlWhere;
},
validflag: // 2019.1 Backwards compatible voor klanten waar S("mld_flag_on_fenote") nog gezet staat
function (flag)
{
if (S("mld_flag_on_fenote") > 0 && flagkey == S("mld_flag_on_fenote"))
return false;
if (S("mld_flag_on_bonote") > 0 && flagkey == S("mld_flag_on_bonote"))
return false;
return true;
}
}
}
%>

2
APPL/MLD/mld_edit_melding.asp
View File

@@ -1177,7 +1177,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var sqla = [];
for (var i=0; i<S("mld_melding_flags"); i++)
{
if (i != S("mld_flag_on_fenote") && i != S("mld_flag_on_bonote"))
if (mld.validflag(i))
sqla.push("SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL");
}
FCLTselector("mldflag",

4
APPL/MLD/mld_flag.asp
View File

@@ -24,9 +24,9 @@ user.auth_required_or_abort(mfe.canWriteFlags);
var result = {};
flagkey = (flagkey+1) % S('mld_melding_flags'); // cycle door de waarden 0, 1, 2, 3.
if (flagkey == S("mld_flag_on_fenote") || flagkey == S("mld_flag_on_bonote"))
if (!mld.validflag(flagkey))
flagkey = (flagkey+1) % S('mld_melding_flags');
if (flagkey == S("mld_flag_on_fenote") || flagkey == S("mld_flag_on_bonote"))
if (!mld.validflag(flagkey))
flagkey = (flagkey+1) % S('mld_melding_flags');
var updatesql = "UPDATE mld_melding"

2
APPL/MLD/mld_forward.asp
View File

@@ -321,7 +321,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"],
var sqla = [];
for (var i=0; i<S("mld_melding_flags"); i++)
{
if (i != S("mld_flag_on_fenote") && i != S("mld_flag_on_bonote"))
if (mld.validflag(i))
sqla.push("SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL");
}
FCLTselector("mldflag",

2
APPL/MLD/mld_search.asp
View File

@@ -904,7 +904,7 @@ oRs.close();
{
for (flagkey=0; flagkey < S("mld_melding_flags"); flagkey++)
{
if (flagkey != S("mld_flag_on_fenote") && flagkey != S("mld_flag_on_bonote"))
if (mld.validflag(flagkey))
RWCHECKBOXTR("flag"+flagkey, "fldcheck", "<i class='fa "+ (flagkey==0?"fa-circle-o":"fa-circle")+" mldflag"+flagkey+" mlds'></i>&nbsp;"+safe.html(L("lcl_mld_flag"+flagkey)), 1, { boxfirst: true, twocols: true });
}
}

2
APPL/PDA/melding.asp
View File

@@ -945,7 +945,7 @@ if (action != "forward")
var sqla = [];
for (var i=0; i<S("mld_melding_flags"); i++)
{
if (i != S("mld_flag_on_fenote") && i != S("mld_flag_on_bonote"))
if (mld.validflag(i))
sqla.push("SELECT "+i+","+safe.quoted_sql(L("lcl_mld_flag"+i))+" FROM DUAL");
}
FCLTselector("mldflag",

2
APPL/PDA/mld_list.asp
View File

@@ -580,7 +580,7 @@ var authparams = user.checkAutorisation(autfunction);
{
for (flagkey=0; flagkey < S("mld_melding_flags"); flagkey++)
{
if (flagkey == S("mld_flag_on_fenote") || flagkey == S("mld_flag_on_bonote"))
if (!mld.validflag(flagkey))
continue; // die onderdrukken
%>
<label for="flag<%=flagkey%>"><input type="checkbox" name="flag<%=flagkey%>" data-mini="true" id="flag<%=flagkey%>" <%=((checkboxParams[flagkey] == "on") ? "checked" : "")%>><i class="fa <%=flagkey==0?"fa-circle-o":"fa-circle"%> mldflag<%=flagkey%> mlds"></i>&nbsp;<%=safe.html(L("lcl_mld_flag"+flagkey))%></label><%