PNBR#52703 Objecten in meldingen lijst (41381) aanpassen

svn path=/Website/trunk/; revision=37761
This commit is contained in:
Erik Groener
2018-04-25 07:23:04 +00:00
parent 115a2cf205
commit 0a6b2c63f9

View File

@@ -282,7 +282,7 @@ function mld_list (pautfunction, params)
+ " WHERE mo.mld_melding_key = m.mld_melding_key "
+ " AND d.ins_deel_key = mo.ins_deel_key "
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key "
+ " AND ROWNUM <= 20) object"
+ " AND ROWNUM <= " + S("mld_listagg_object_count") + ") object"
+ ", (SELECT COUNT (1) "
+ " FROM ins_v_aanwezigdeel d, ins_srtdeel s, mld_melding_object mo "
+ " WHERE mo.mld_melding_key = m.mld_melding_key "
@@ -680,8 +680,14 @@ function mld_list (pautfunction, params)
else if (oRs("object").Value == null)
return "";
switch (S("mld_listagg_object_delimiter"))
{
case "comma": list_delimiter = ", "; break;
case "newline": list_delimiter = "<br>"; break;
default: list_delimiter = ", ";
}
var obj = oRs("object").Value;
var ret = (outputmode == 0 ? I("fa-hand-o-right") + " " : "") + obj.format(", ");
var ret = (outputmode == 0 ? I("fa-hand-o-right") + " " : "") + obj.format(list_delimiter);
if (obj.indexOf("{0}") == -1) // single object
return "<span class=\"nowrap\">" + ret + "</span>";
else