← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12913: Dashboard, fixed issue with message sender for system messages

 

------------------------------------------------------------
revno: 12913
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-11-10 23:43:14 +0100
message:
  Dashboard, fixed issue with message sender for system messages
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	2013-11-06 16:30:25 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2013-11-10 22:43:14 +0000
@@ -466,7 +466,10 @@
 	{
 		$.each( json.messageConversations, function( index, message )
 		{
-			var sender = message.lastSenderFirstname + " " + message.lastSenderSurname;
+			var firstName = ( undefined !== message.lastSenderFirstname ) ? message.lastSenderFirstname : "";
+			var surname = ( undefined !== message.lastSenderSurname ) ? message.lastSenderSurname: "";
+			
+			var sender = firstName + " " + surname;
 			var count = message.messageCount > 1 ? ( " (" + message.messageCount + ")" ) : "";			
 			var readSpan = message.read ? "" : " class='bold'";