------------------------------------------------------------ revno: 14667 committer: Tran Chau <[email protected]> branch nick: dhis2 timestamp: Fri 2014-04-04 22:32:06 +0700 message: Fixed bug - Don't display the program attributes in Add/Update validation criteria form. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.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-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm 2014-03-19 06:44:30 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm 2014-04-04 15:32:06 +0000 @@ -26,7 +26,7 @@ <td> <select id='property' name='property' style='width:16em' onChange="showDivValue();"> <option value="" selected="selected">[$i18n.getString( "please_select" )]</option> - #foreach($programAttribute in $program.programAttributes) + #foreach($programAttribute in $program.attributes) #set($opt="") #foreach($option in $programAttribute.attribute.optionSet.options) #set($opt=$opt + ';' + $option ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm 2014-03-19 06:44:30 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm 2014-04-04 15:32:06 +0000 @@ -27,12 +27,12 @@ <select id='property' name='property' style='width:16em' onChange="showDivValue();"> <option value="" selected="selected">[$i18n.getString( "please_select" )]</option> #set($attribute = '') - #foreach($programAttribute in $program.programAttributes) + #foreach($programAttribute in $program.attributes) #set($opt="") #foreach($option in $programAttribute.attribute.optionSet.options) #set($opt=$opt + ';' + $option ) #end - <option value="$programPatientAttribute.patientAttribute.uid" opt="$opt" #if($validationCriteria.property==$programPatientAttribute.patientAttribute.uid) #set($attribute = $programPatientAttribute.patientAttribute) selected #end>$programPatientAttribute.patientAttribute.displayName</option> + <option value="$programAttribute.attribute.uid" opt="$opt" #if($validationCriteria.property==$$programAttribute.attribute.uid) #set($attribute = $$programAttribute.attribute) selected #end>$programAttribute.attribute.displayName</option> #end </select> </td>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
