dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2370
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2010-12-14 14:12:30 +0700
message:
  Fixed bug encoding in Orgunit Search functionality.
  Added the contact details when viewing orgunit by searching.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.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-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2010-12-13 17:03:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml	2010-12-14 07:12:30 +0000
@@ -43,11 +43,7 @@
 			class="org.hisp.dhis.oum.action.organisationunit.PrepareAddOrganisationUnitAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm</param>
-			<param name="javascripts">
-					javascript/shortName.js,
-					javascript/organisationUnit.js,
-					../dhis-web-commons/ouwt/ouwt.js				
-			</param>
+			<param name="javascripts">javascript/shortName.js,../dhis-web-commons/ouwt/ouwt.js</param>
 			<param name="requiredAuthorities">F_ORGANISATIONUNIT_ADD</param>
 		</action>
 
@@ -76,11 +72,7 @@
 			class="org.hisp.dhis.oum.action.organisationunit.GetOrganisationUnitAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm</param>
-			<param name="javascripts">
-					javascript/shortName.js,
-					javascript/organisationUnit.js,
-					../dhis-web-commons/ouwt/ouwt.js
-			</param>
+			<param name="javascripts">javascript/shortName.js,../dhis-web-commons/ouwt/ouwt.js</param>
 			<param name="requiredAuthorities">F_ORGANISATIONUNIT_UPDATE</param>
 		</action>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm	2010-12-13 15:26:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitDetails.vm	2010-12-14 07:12:30 +0000
@@ -35,6 +35,22 @@
 <td><b>$i18n.getString( "last_updated" ):</b></td>
 <td>$!format.formateDate( $organisationUnit.lastUpdated )</td>
 </tr>
+<tr>
+<td><b>$i18n.getString( "contact_person" ):</b></td>
+<td>$!encoder.htmlEncode( $organisationUnit.contactPerson )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "address" ):</b></td>
+<td>$!encoder.htmlEncode( $organisationUnit.address )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "email" ):</b></td>
+<td>$!encoder.htmlEncode( $organisationUnit.email )</td>
+</tr>
+<tr>
+<td><b>$i18n.getString( "phone_number" ):</b></td>
+<td>$!encoder.htmlEncode( $organisationUnit.phoneNumber )</td>
+</tr>
 
 #foreach( $groupSet in $groupSets )
 <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm	2010-12-13 17:03:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm	2010-12-14 07:12:30 +0000
@@ -7,7 +7,7 @@
 
 <h3>$i18n.getString( "org_unit_search_management" )</h3>
 
-<form action="organisationUnitSearch.action" method="get">
+<form action="organisationUnitSearch.action" method="post">
 <table>
 <tr>
 <th>$i18n.getString( "criteria" )</th>