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

DJIN #54781 Bijlage zichtbaar in melding/opdrachtoverzicht

Browse Source 
svn path=/Website/trunk/; revision=39380
This commit is contained in:
Erik Groener
2018-10-12 10:30:00 +00:00
parent 122b5e77ed
commit 3c025ebe2e
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
APPL/MLD/mld_list.inc
View File

@@ -1022,6 +1022,7 @@ function mld_list (pautfunction, params)
function fncolFlexBijlagen(oRs)
{
var flexval = oRs("flex").Value;
var mld_key = oRs("mld_melding_key").Value;
var bijlagen_oms = "";
var bijlagen_aantal = 0;
@@ -1055,7 +1056,13 @@ function mld_list (pautfunction, params)
oRs_k.MoveNext();
}
oRs_k.Close();
return "<span title='" + Server.HTMLEncode(bijlagen_lijst.join("\n")) + "'>" + bijlagen_aantal + "</span>";
return (flexval ? safe.html(flexval.replace(/\r/g, "\n")+ "\n") : "")
+ ( bijlagen_aantal > 0
? "<span title='" + safe.htmlattr(bijlagen_lijst.join("\n")) + "'>"
+ safe.html(bijlagen_oms) + ": " + bijlagen_aantal
+ "</span>"
: ""
);
}
@@ -1193,9 +1200,7 @@ function mld_list (pautfunction, params)
if (anyflex)
{
rst.addColumn(new Column({caption: flexlabel, content: "flex"}));
if (bijlageflex)
rst.addColumn(new Column({caption: L("lcl_appendixes_sum"), content: fncolFlexBijlagen}));
rst.addColumn(new Column({caption: flexlabel, content: fncolFlexBijlagen}));
}
// laatste actiedatum

13
APPL/MLD/opdr_list.inc
View File

@@ -613,6 +613,7 @@ function opdr_list(params)
function fncolFlexBijlagen(oRs)
{
var flexval = oRs("flex").Value;
var opdr_key = oRs("mld_opdr_key").Value;
var bijlagen_oms = "";
var bijlagen_aantal = 0;
@@ -645,7 +646,13 @@ function opdr_list(params)
oRs_k.MoveNext();
}
oRs_k.Close();
return "<span title='" + Server.HTMLEncode(bijlagen_lijst.join("\n")) + "'>" + bijlagen_aantal + "</span>";
return (flexval ? safe.html(flexval.replace(/\r/g, "\n")+ "\n") : "")
+ ( bijlagen_aantal > 0
? "<span title='" + safe.htmlattr(bijlagen_lijst.join("\n")) + "'>"
+ safe.html(bijlagen_oms) + ": " + bijlagen_aantal
+ "</span>"
: ""
);
}
@@ -778,9 +785,7 @@ function opdr_list(params)
}
if (params.anyflex)
{
rst.addColumn(new Column({caption: flexlabel, content: "flex"}));
if (params.bijlageflex)
rst.addColumn(new Column({caption: L("lcl_appendixes_sum"), content: fncolFlexBijlagen}));
rst.addColumn(new Column({caption: flexlabel, content: fncolFlexBijlagen}));
}
// actions conditioneel maken?