dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12032
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-09-11 10:48:55 +0700
message:
  Fixed bug - Open default reistration oform ( no program details ) when to click Register new person in Relationships in Dashboard.
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/relationshipPatient.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-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	2013-09-10 15:46:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-09-11 03:48:55 +0000
@@ -227,7 +227,7 @@
 	if(getFieldValue('programIdAddPatient')!='')
 	{
 		programIds += "&programIds=" + getFieldValue('programIdAddPatient');
-		params += "prg_" + getFieldValue('programIdAddPatient');
+		params += "searchTexts=prg_" + getFieldValue('programIdAddPatient');
 	}
 	var programStageId = jQuery('#programStageAddPatient').val();
 	if( getFieldValue('searchByProgramStage') == "true" ){
@@ -238,7 +238,7 @@
 			orgunitid = 0;
 		}
 		var endDueDate = getFieldValue('endDueDate');
-		params = '&searchTexts=stat_' + getFieldValue('programIdAddPatient') 
+		params += '&searchTexts=stat_' + getFieldValue('programIdAddPatient') 
 			   + '_' + startDueDate + '_' + endDueDate
 			   + "_" + orgunitid
 			   + '_' + followup + '_' + statusEvent;
@@ -253,7 +253,6 @@
 				if( idx == 0){
 					p = "&searchTexts=" + item.value;
 					if(item.value=='prg'){
-						params += '&prg=';
 						flag = true;
 					}
 				}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2013-07-31 06:51:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2013-09-11 03:48:55 +0000
@@ -36,7 +36,6 @@
 	jQuery('#addRelationshipDiv').load('showAddRelationshipPatient.action',
 		{
 			id:patientId,
-			programId: getFieldValue('programIdAddPatient'),
 			programStageInstanceId: programStageInstanceId
 		}, function()
 		{