=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/acl/AclService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/acl/AclService.java 2015-03-16 13:12:20 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/acl/AclService.java 2015-05-26 01:50:39 +0000 @@ -177,6 +177,14 @@ boolean canExternalize( User user, Class klass ); /** + * Is the default for this type to be private? + * + * @param klass Type to check + * @return Result of test + */ + boolean defaultPrivate( Class klass ); + + /** * Is the default for this type to be public? * * @param klass Type to check === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/acl/DefaultAclService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/acl/DefaultAclService.java 2015-05-26 01:45:28 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/acl/DefaultAclService.java 2015-05-26 01:50:39 +0000 @@ -258,10 +258,16 @@ } @Override + public boolean defaultPrivate( Class klass ) + { + Schema schema = schemaService.getSchema( klass ); + return schema != null && schema.isDefaultPrivate(); + } + + @Override public boolean defaultPublic( Class klass ) { - Schema schema = schemaService.getSchema( klass ); - return schema == null || !schema.isDefaultPrivate(); + return !defaultPrivate( klass ); } @Override