=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientIdentifierType.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientIdentifierType.vm 2011-09-28 07:11:18 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientIdentifierType.vm 2011-10-03 06:48:21 +0000 @@ -6,6 +6,6 @@ "mandatory": "$!{patientIdentifierType.mandatory}", "related": "$!{patientIdentifierType.related}", "noChars": "$!{patientIdentifierType.noChars}", - "type": $!{patientIdentifierType.type}" + "type": "$!{patientIdentifierType.type}" } } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2011-09-28 07:11:18 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js 2011-10-03 06:48:21 +0000 @@ -6,20 +6,20 @@ { jQuery.post( 'getPatientIdentifierType.action', { id: patientIdentifierTypeId }, function ( json ) { - setInnerHTML( 'idField', json.patientAttributeType.id ); - setInnerHTML( 'nameField', json.patientAttributeType.name ); - setInnerHTML( 'descriptionField', json.patientAttributeType.description ); + setInnerHTML( 'idField', json.patientIdentifierType.id ); + setInnerHTML( 'nameField', json.patientIdentifierType.name ); + setInnerHTML( 'descriptionField', json.patientIdentifierType.description ); var boolValueMap = { 'true':i18n_yes, 'false':i18n_no }; - var boolType = json.patientAttributeType.mandatory; + var boolType = json.patientIdentifierType.mandatory; setInnerHTML( 'mandatoryField', boolValueMap[boolType] ); - boolType = json.patientAttributeType.related; + boolType = json.patientIdentifierType.related; setInnerHTML( 'relatedField', boolValueMap[boolType] ); - setInnerHTML( 'noCharsField', json.patientAttributeType.noChars ); + setInnerHTML( 'noCharsField', json.patientIdentifierType.noChars ); var valueTypeMap = { 'text':i18n_string, 'number':i18n_number, 'letter':i18n_alphabet }; - var valueType = json.patientAttributeType.type; + var valueType = json.patientIdentifierType.type; setInnerHTML( 'typeField', valueTypeMap[valueType] ); showDetails();