From 6ea257d99503dfc35a4f77fa62462051022e697f Mon Sep 17 00:00:00 2001 From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Tue, 6 Jul 2010 21:20:19 +0000 Subject: [PATCH] 'isReadByInterlocutor' marker in PMMessage template --- Builder/IISMainHandler/build.txt | 2 +- Builder/IISUploadHandler/build.txt | 2 +- Common/dataobjects/PMMessage.cs | 8 ++++++++ static/css/global.css | 3 +++ templates/Full/elems/PMInfo.xslt | 3 +++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index ca6d18c..51d3b0f 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -616 \ No newline at end of file +617 \ No newline at end of file diff --git a/Builder/IISUploadHandler/build.txt b/Builder/IISUploadHandler/build.txt index 0dbf139..b2786cd 100644 --- a/Builder/IISUploadHandler/build.txt +++ b/Builder/IISUploadHandler/build.txt @@ -1 +1 @@ -350 \ No newline at end of file +351 \ No newline at end of file diff --git a/Common/dataobjects/PMMessage.cs b/Common/dataobjects/PMMessage.cs index 5547f6f..e9fccbb 100644 --- a/Common/dataobjects/PMMessage.cs +++ b/Common/dataobjects/PMMessage.cs @@ -117,6 +117,11 @@ namespace FLocal.Common.dataobjects { return this._incomingPMId; } } + public PMMessage incomingPM { + get { + return PMMessage.LoadById(this.incomingPMId.Value); + } + } private bool _isRead; public bool isRead { @@ -160,6 +165,9 @@ namespace FLocal.Common.dataobjects { new XElement("body", context.outputParams.preprocessBodyIntermediate(this.body)), new XElement("bodyUBB", this.bodyUBB) ); + if(this.direction == ENUM_DIRECTION_OUTGOING) { + result.Add(new XElement("isReadByInterlocutor", this.incomingPM.isRead)); + } if(additional.Length > 0) { result.Add(additional); } diff --git a/static/css/global.css b/static/css/global.css index c9c352d..c4bf9bc 100644 --- a/static/css/global.css +++ b/static/css/global.css @@ -82,3 +82,6 @@ pre [spoiler] [opener] { cursor:hand; } +.warning { + background-color:red; +} \ No newline at end of file diff --git a/templates/Full/elems/PMInfo.xslt b/templates/Full/elems/PMInfo.xslt index 9b521cd..55c7713 100644 --- a/templates/Full/elems/PMInfo.xslt +++ b/templates/Full/elems/PMInfo.xslt @@ -15,6 +15,9 @@
+ |