dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2657
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-01-20 12:20:01 +0700
message:
  Fix bug: After clicking on List All Beneficiary in the text box for Search, the text is coming (list_all_patients)
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.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-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java	2011-01-20 03:13:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java	2011-01-20 05:20:01 +0000
@@ -232,8 +232,6 @@
             selectedStateManager.clearSearchText();
             selectedStateManager.setListAll( listAll );
 
-            searchText = "list_all_patients";
-
             listAllPatient( organisationUnit, sortingPatientAttribute );
 
             return SUCCESS;
@@ -296,8 +294,6 @@
         {
         	listAllPatient( organisationUnit, sortingPatientAttribute );
 
-            searchText = "list_all_patients";
-
             return SUCCESS;
 
         }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm	2011-01-20 02:18:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatient.vm	2011-01-20 05:20:01 +0000
@@ -1,11 +1,5 @@
 #parse( "/dhis-web-maintenance-patient/patient.vm" )
 
-#if($searchText) 
-	#set ($sText = $searchText )
-#else 
-	#set ($sText = "" )
-#end
-
 <style>
 tr.relationship-row{background-color: #BFFFC2; display : none}
 </style>
@@ -15,7 +9,13 @@
 		<td>$i18n.getString( "search_result_matching_the_search_criteria" )</td>
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
-		<td>$i18n.getString( $sText )</td>
+		<td>
+			#if($!searchText) 
+				$searchText
+			#else 
+				$i18n.getString( "list_all_patients" )
+			#end
+		</td>
 	</tr>	
 	<tr>
 		<td>$i18n.getString( "total_result" )</td>