=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm 2012-05-30 03:38:42 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm 2012-05-30 03:52:28 +0000 @@ -6,7 +6,7 @@ "stageInProgram": "${programStage.stageInProgram}", "minDaysFromStart": "${programStage.minDaysFromStart}", "dataElementCount": "${programStageDataElements.size()}", - "standardInterval": "${programStage.standardInterval}", + "standardInterval": "$!programStage.standardInterval", #set( $size = ${programStageDataElements.size()} ) "dataElement": [ === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2012-03-27 01:29:30 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2012-05-30 03:52:28 +0000 @@ -23,7 +23,7 @@ #foreach( $identifierType in $identifierTypes ) - $encoder.htmlEncode( $identifierType.name ) + $encoder.htmlEncode( $identifierType.name ) $i18n.getString( 'edit' ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2012-03-27 01:29:30 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2012-05-30 03:52:28 +0000 @@ -28,7 +28,7 @@ #foreach( $patientAttribute in $patientAttributes ) - $encoder.htmlEncode( $patientAttribute.name ) + $encoder.htmlEncode( $patientAttribute.name ) $i18n.getString( 'edit' ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2012-01-11 07:42:49 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2012-05-30 03:52:28 +0000 @@ -26,7 +26,7 @@ #foreach( $patientAttributeGroup in $patientAttributeGroups ) - $encoder.htmlEncode( $patientAttributeGroup.name ) + $encoder.htmlEncode( $patientAttributeGroup.name ) $i18n.getString( 'edit' ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2012-05-23 15:02:50 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2012-05-30 03:52:28 +0000 @@ -20,7 +20,7 @@ #foreach( $program in $programs ) - $encoder.htmlEncode( $program.name ) + $encoder.htmlEncode( $program.name ) $i18n.getString( 'assign_program_to_orgunits' ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2012-05-26 17:38:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2012-05-30 03:52:28 +0000 @@ -30,8 +30,8 @@ #foreach( $association in $associations ) - $encoder.htmlEncode( $association.name ) - $encoder.htmlEncode( $association.description ) + $encoder.htmlEncode( $association.name ) + $encoder.htmlEncode( $association.description ) $i18n.getString( 'edit' ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2012-02-15 07:24:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2012-05-30 03:52:28 +0000 @@ -30,12 +30,12 @@ #foreach( $validation in $validations ) - $validation.description + $validation.description #if($validation.rightSide=="1==1") - $i18n.getString( + $i18n.getString( 'edit' ) #else - $i18n.getString( + $i18n.getString( 'edit' ) #end $i18n.getString( $i18n.getString( === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2012-02-27 01:07:19 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2012-05-30 03:52:28 +0000 @@ -26,9 +26,9 @@ #foreach( $relationshipType in $relationshipTypes ) - $encoder.htmlEncode( $relationshipType.aIsToB )/$encoder.htmlEncode( $relationshipType.bIsToA ) + $encoder.htmlEncode( $relationshipType.aIsToB )/$encoder.htmlEncode( $relationshipType.bIsToA ) - $encoder.htmlEncode( $relationshipType.name ) + $encoder.htmlEncode( $relationshipType.name ) $i18n.getString( 'edit' )