← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7668: Don't load person-attributes and identifier-types if selected program is anonymous in Tabular rep...

 

------------------------------------------------------------
revno: 7668
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-23 15:51:24 +0700
message:
  Don't load person-attributes and identifier-types if selected program is anonymous in Tabular report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.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/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-21 14:59:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-23 08:51:24 +0000
@@ -2006,8 +2006,9 @@
 													TR.cmp.params.patientProperty.panel
 												);
 												
-												var programId = TR.cmp.settings.program.getValue();													
-												if (programId != null && !TR.store.patientProperty.available.isloaded) {
+												var programId = TR.cmp.settings.program.getValue();			
+												var programType = TR.cmp.settings.program.displayTplData[0].type;											
+												if (programId != null && !TR.store.patientProperty.available.isloaded && programType !='3') {
 													TR.store.patientProperty.available.load({params: {programId: programId}});
 												}
 											}