=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java 2014-04-07 09:21:32 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java 2014-04-07 09:34:43 +0000 @@ -111,9 +111,9 @@ * approval levels from low to high.) * * @param newLevel the new level to add. - * @return true if level was added, false if not well formed or duplicate. + * @return the identifier of the added level, or -1 if not well formed or duplicate. */ - boolean addDataApprovalLevel( DataApprovalLevel newLevel ); + int addDataApprovalLevel( DataApprovalLevel newLevel ); /** * Removes a data approval level. === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java 2014-04-07 09:21:32 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java 2014-04-07 09:34:43 +0000 @@ -267,20 +267,20 @@ return false; } - public boolean addDataApprovalLevel( DataApprovalLevel newLevel ) + public int addDataApprovalLevel( DataApprovalLevel newLevel ) { List dataApprovalLevels = getAllDataApprovalLevels(); if ( newLevel.getOrgUnitLevel() <= 0 ) { - return false; + return -1; } int index = getInsertIndex( dataApprovalLevels, newLevel ); if ( index < 0 ) { - return false; + return -1; } dataApprovalLevels.add( index, newLevel ); @@ -295,9 +295,7 @@ newLevel.setLevel( index + 1 ); newLevel.setCreated( new Date() ); - dataApprovalLevelStore.save( newLevel ); - - return true; + return dataApprovalLevelStore.save( newLevel ); } public void deleteDataApprovalLevel( int level )