dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27272
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13549: minor fix
------------------------------------------------------------
revno: 13549
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-01-02 19:31:49 +0100
message:
minor fix
modified:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2014-01-02 10:24:48 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2014-01-02 18:31:49 +0000
@@ -457,10 +457,11 @@
dhis2.db.renderMessagesItem = function( $d, itemId )
{
var html = dhis2.db.linkItemHeaderHtml( itemId, "Messages" ) + "</ul></div></li>";
+
+ $d.append( html );
+
var $ul = $( "#ul-" + itemId );
- $d.append( html );
-
$.get( "../api/messageConversations.json?viewClass=detailed&pageSize=5", function( json )
{
$.each( json.messageConversations, function( index, message )
@@ -471,7 +472,7 @@
var sender = firstName + " " + surname;
var count = message.messageCount > 1 ? ( " (" + message.messageCount + ")" ) : "";
var readSpan = message.read ? "" : " class='bold'";
-
+
$ul.append(
"<li><a href='readMessage.action?id=" + message.id + "'>" +
"<span" + readSpan + ">" + sender + count + " <span class='tipText'>" + message.lastMessage + "</span><br>"