dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9022
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-11-14 12:33:27 +0100
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.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/interpretation.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm	2012-11-08 14:13:17 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm	2012-11-14 11:33:27 +0000
@@ -12,6 +12,7 @@
 <script type="text/javascript">
 var currentUser = {
 	id: "${currentUser.id}",
+	uid: "${currentUser.uid}",
 	name: "${currentUser.name}"
 };	
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js	2012-11-14 11:17:41 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js	2012-11-14 11:33:27 +0000
@@ -73,11 +73,16 @@
 			success: function() {			
 				var template = 
 					"<div><div class=\"interpretationName\">" +
-					"<a class=\"bold userLink\" href=\"profile.action?id=${userId}\">${userName}</a>&nbsp;" +
+					"<a class=\"bold userLink\" href=\"profile.action?id=${userUid}\">${userName}</a>&nbsp;" +
 					"<span class=\"grey\">${created}<\/span><\/div><\/div>" +
 					"<div class=\"interpretationText\">${text}<\/div>";
 				
-				$.tmpl( template, { "userId": currentUser.id, "userName": currentUser.name, created: created, text: text } ).appendTo( "#comments" + uid );
+				$.tmpl( template, { 
+					"userId": currentUser.id,
+					"userUid": currentUser.uid,
+					"userName": currentUser.name, 
+					created: created, 
+					text: text } ).appendTo( "#comments" + uid );
 			}		
 		} );
 	}