=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm 2014-07-13 07:53:57 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm 2015-04-03 09:43:49 +0000 @@ -15,6 +15,11 @@ "coordinates": "$!encoder.jsonEncode( ${organisationUnit.coordinates} )", "latitude": "$!{organisationUnit.latitude}", "longitude": "$!{organisationUnit.longitude}", - "hasChild": $!{organisationUnit.hasChild()} + "hasChild": $!{organisationUnit.hasChild()}, + "user": { + "uid": "$!organisationUnit.user.uid", + "name":"$!encoder.jsonEncode( ${organisationUnit.user.name} )" + } } + } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2014-11-20 15:06:59 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js 2015-04-03 09:43:49 +0000 @@ -40,6 +40,7 @@ setInnerHTML( 'descriptionField', json.organisationUnit.description ); setInnerHTML( 'openingDateField', json.organisationUnit.openingDate ); setInnerHTML( 'idField', json.organisationUnit.uid ); + setInnerHTML( 'createdByField', json.organisationUnit.user.name ); var orgUnitCode = json.organisationUnit.code; setInnerHTML( 'codeField', orgUnitCode ? orgUnitCode : '[' + none + ']' ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2014-10-15 12:19:54 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2015-04-03 09:43:49 +0000 @@ -80,6 +80,7 @@




+