dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3937
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-06-17 19:37:34 +0200
message:
  Improved silly code by yours truly
removed:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/getUserInfo.vm
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/readMessage.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm


--
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/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml	2011-06-17 13:22:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml	2011-06-17 17:37:34 +0000
@@ -109,10 +109,5 @@
       <result name="success" type="redirect">message.action</result>
     </action>
     
-	<action name="getUserInfo" class="org.hisp.dhis.commons.action.GetUserAction">
-	  <result name="success" type="velocity">/dhis-web-dashboard-integration/getUserInfo.vm</result>
-	  <param name="onExceptionReturn">plainTextError</param>
-	</action>
-	
   </package>
 </struts>

=== removed file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/getUserInfo.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/getUserInfo.vm	2011-06-17 13:22:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/getUserInfo.vm	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<h3>$user.name</h3>
-<table>
-<tr>
-<td><label>$i18n.getString( "email" ):</label></td>
-<td>$!encoder.htmlEncode( ${user.email} )</td>
-</tr>
-<tr>
-<td><label>$i18n.getString( "phone_number" ):</label></td>
-<td>$!encoder.htmlEncode( ${user.phoneNumber} )</td>
-</tr>
-<tr>
-<td><label>$i18n.getString( "organisation_units" ):</label></td>
-<td>$!encoder.htmlEncode( ${user.organisationUnitsName} )</td>
-</tr>
-</table>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/readMessage.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/readMessage.js	2011-06-17 13:22:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/readMessage.js	2011-06-17 17:37:34 +0000
@@ -13,7 +13,5 @@
 
 function showSenderInfo( id )
 {
-	$( "#senderInfo" ).load( "getUserInfo.action", { id:id }, function() {
-		dialog.dialog( "open" );
-	} );
+	dialog.dialog( "open" );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2011-06-17 13:22:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2011-06-17 17:37:34 +0000
@@ -12,4 +12,20 @@
 <input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='message.action'" style="width:120px">
 </div>
 
-<div id="senderInfo"></div>
+<div id="senderInfo" style="display:none">
+<h3>$message.message.sender.name</h3>
+<table>
+<tr>
+<td><label>$i18n.getString( "email" ):</label></td>
+<td>$!encoder.htmlEncode( ${message.message.sender.email} )</td>
+</tr>
+<tr>
+<td><label>$i18n.getString( "phone_number" ):</label></td>
+<td>$!encoder.htmlEncode( ${message.message.sender.phoneNumber} )</td>
+</tr>
+<tr>
+<td><label>$i18n.getString( "organisation_units" ):</label></td>
+<td>$!encoder.htmlEncode( ${message.message.sender.organisationUnitsName} )</td>
+</tr>
+</table>
+</div>