=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2014-10-25 21:58:41 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2014-10-25 22:06:04 +0000 @@ -278,10 +278,18 @@ DataApproval approval = status.getDataApproval(); + Map approvalLevel = new HashMap<>(); + + if ( status.getDataApprovalLevel() != null ) + { + approvalLevel.put( "id", status.getDataApprovalLevel().getUid() ); + approvalLevel.put( "level", String.valueOf( status.getDataApprovalLevel().getLevel() ) ); + } + if ( approval != null ) { item.put( "id", approval.getAttributeOptionCombo().getUid() ); - item.put( "level", status.getDataApprovalLevel() ); + item.put( "level", approvalLevel ); item.put( "ou", approval.getOrganisationUnit().getUid() ); item.put( "accepted", approval.isAccepted() ); item.put( "permissions", status.getPermissions() );