dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7443
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-06-28 11:07:13 +0700
message:
  Fixed error when to click Back button from Relationship management form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.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-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-06-27 07:34:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-06-28 04:07:13 +0000
@@ -148,7 +148,7 @@
 	
 	if ( key==13 )// Enter
 	{
-		searchAdvancedPatients();
+		validateAdvancedSearch();
 	}
 }
 
@@ -159,7 +159,7 @@
 	 return (e)? e.which : null;
 }
 
-function validateAdvancedPatients()
+function validateAdvancedSearch()
 {
 	hideById( 'listPatientDiv' );
 	var flag = true;
@@ -202,7 +202,7 @@
 		});
 		contentDiv = 'listPatientDiv';
 		jQuery( "#loaderDiv" ).show();
-		searchAdvancedPatient( params );
+		advancedSearch( params );
 	}
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2012-06-27 08:21:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2012-06-28 04:07:13 +0000
@@ -147,7 +147,7 @@
 		});
 }
 
-function searchAdvancedPatient( params )
+function advancedSearch( params )
 {
 	$.ajax({
 		url: 'searchPatient.action',

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-06-27 07:34:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-06-28 04:07:13 +0000
@@ -586,7 +586,7 @@
 	}
 	else if( statusSearching == 1 )
 	{
-		searchAdvancedPatient();
+		validateAdvancedSearch();
 	}
 }
 
@@ -774,7 +774,7 @@
 		});
 }
 
-function searchAdvancedPatient( params )
+function advancedSearch( params )
 {
 	$.ajax({
 		url: 'searchRegistrationPatient.action',

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2012-06-28 04:07:13 +0000
@@ -55,7 +55,7 @@
 						<input type='checkbox' id='searchBySelectedOrgunit' name='searchBySelectedOrgunit' value='true' />
 					</td>
 					<td>
-						<input type="button" class='large-button' value='$i18n.getString( "search" )' onclick='validateAdvancedPatients();'>
+						<input type="button" class='large-button' value='$i18n.getString( "search" )' onclick='validateAdvancedSearch();'>
 					</td>
 				</td>
 			</tr>