FCLT#56141 Melding notificaties in de queue alvast tonen in 'tracking'
svn path=/Website/trunk/; revision=40941
This commit is contained in:
@@ -28,6 +28,8 @@ FCLTHeader.Requires({js: ["jquery-ui.js", "../mld/mld_list.js"]})
|
||||
var urole = getQParamSafe("urole", "fe");
|
||||
var outputmode = getQParamInt("outputmode", 0);
|
||||
var tracking = getQParamInt("tracking", (urole=="fe"?0:1)) == 1; // tracking erbij tonen? Onderdrukken met 0
|
||||
var hasTracking = ((S("mld_merge_notes_and_tracking") & 1 || S("mld_merge_notes_and_tracking") & 2) && tracking);
|
||||
|
||||
var tmp_note = getQParam("tmp_note", "");
|
||||
var parent_reload = getQParamInt("parent_reload", 0);
|
||||
|
||||
@@ -312,7 +314,7 @@ if (mld_key > 0)
|
||||
}
|
||||
|
||||
var init = 0;
|
||||
var hasTracking = <%=(((S("mld_merge_notes_and_tracking") & 1 || S("mld_merge_notes_and_tracking") & 2) && tracking) ? 1 : 0)%>;
|
||||
var hasTracking = <%= hasTracking ? 1 : 0 %>;
|
||||
var hasNoteToggle = $("span.notetoggler").length ? 1 : 0;
|
||||
if (hasTracking || hasNoteToggle) // Anders valt er niets te togglen
|
||||
{
|
||||
@@ -679,6 +681,21 @@ if (mld_key > 0)
|
||||
// Voeg eventueel weer toe wat er voor de reload als gevolg van upload bijlage stond.
|
||||
note_oms = (tmp_note != "" ? tmp_note : note_oms);
|
||||
|
||||
if (hasTracking)
|
||||
{
|
||||
var sql = "SELECT * FROM fac_v_notifyqueue"
|
||||
+ " WHERE BITAND(fac_notificatie_status, 2) = 2" // email
|
||||
+ " AND fac_srtnotificatie_xmlnode = 'melding'"
|
||||
+ " AND fac_notificatie_refkey = " + mld_key;
|
||||
var oRs = Oracle.Execute(sql);
|
||||
while (!oRs.EOF)
|
||||
{
|
||||
Response.Write("<tr><td></td><td><i>" + L("lcl_puo_willsendnoti").format(oRs("fac_srtnotificatie_code").Value, safe.html(oRs("fac_notificatie_receiver_email").Value)) + "</i></td></tr>");
|
||||
oRs.MoveNext();
|
||||
}
|
||||
oRs.Close();
|
||||
}
|
||||
|
||||
// Aanvulling textbox niet tonen als ik alleen FEread rechten heb gekregen vanwege het feit dat de melding een parent van een eigen melding is (!mfe.parentOfOwnRead).
|
||||
if ((!mfe.haveOnlyFErights && mfe.canReadAny) || (mfe.haveOnlyFErights && !mfe.parentOfOwnRead && mld_info.fenotes > 0))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user