=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2014-02-12 12:08:30 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2014-04-10 14:59:27 +0000 @@ -1,6 +1,7 @@ remove_all=Remove All Locks done=Done loading=Loading, please wait +optional=Optional data_administration=Data Administration period_type=Period Type select_options=Please select at least one option === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetApprovalSettingsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetApprovalSettingsAction.java 2014-04-09 04:27:35 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetApprovalSettingsAction.java 2014-04-10 14:59:27 +0000 @@ -85,6 +85,13 @@ return approvalLevelService; } + private boolean categoryOptionGroupSetsPresent; + + public boolean isCategoryOptionGroupSetsPresent() + { + return categoryOptionGroupSetsPresent; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -95,6 +102,17 @@ dataApprovalLevels = dataApprovalLevelService.getAllDataApprovalLevels(); + categoryOptionGroupSetsPresent = false; + + for ( DataApprovalLevel level : dataApprovalLevels ) + { + if ( level.getCategoryOptionGroupSet() != null ) + { + categoryOptionGroupSetsPresent = true; + break; + } + } + approvalLevelService = dataApprovalLevelService; return SUCCESS; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/addApprovalLevel.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/addApprovalLevel.vm 2014-03-31 11:43:23 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/addApprovalLevel.vm 2014-04-10 14:59:27 +0000 @@ -6,7 +6,7 @@