FSN#42109: Laatste notitie altijd compleet tonen

svn path=/Website/trunk/; revision=35383
This commit is contained in:
Jos Groot Lipman
2017-09-20 12:17:51 +00:00
parent 05f66e774b
commit 283c69fd79

View File

@@ -277,7 +277,8 @@ var timestamp_notes = new Date();
var last_note_key = oRs("mld_melding_note_key").Value;
var note_zichtbaarFE = oRs("mld_melding_note_flag").value == 1;
oRs.MoveNext();
var LastIsSelfNote = oRs.Eof && user.isCollega(prs_key) && !srtnoti;
var LastIsNote = oRs.Eof && !srtnoti;
var LastIsSelfNote = LastIsNote && user.isCollega(prs_key);
var clsself = "";
if (prs_key == user_key)
@@ -319,8 +320,8 @@ var timestamp_notes = new Date();
var autocollapse = S("mld_note_autocollapse") && note_oms.match(new RegExp(S("mld_note_autocollapse")));
if (autocollapse || safehtml.length > S("rs_maxchar") * 5)
{
safehtml = "<div class='notetoggler {1}'>{0}</div>".format(safehtml, autocollapse?"autocollapse":"")
+ "<span class='notetoggler'>" + L("lcl_rs_truncated") + "</span>";
safehtml = "<div class='notetoggler {1}'>{0}</div>".format(safehtml, autocollapse?"autocollapse":(LastIsNote?"open":""))
+ "<span class='notetoggler " + (LastIsNote?"open":"") + "'>" + (LastIsNote?L("lcl_rs_truncate"):L("lcl_rs_truncated")) + "</span>";
}
Response.Write("<tr class='mldhandlingdiv"+clsself+cls_tr+"'>"
+ "<td class='" + cls + "'>");