=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java 2016-02-24 04:40:54 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java 2016-02-27 11:03:16 +0000 @@ -433,7 +433,18 @@ private FieldMap getFullFieldMap( Schema schema ) { FieldMap fieldMap = new FieldMap(); - fieldMap.put( ":owner", new FieldMap() ); + + if ( schema.isPersisted() ) + { + fieldMap.put( ":owner", new FieldMap() ); + } + else + { + for ( String mapKey : schema.getPropertyMap().keySet() ) + { + fieldMap.put( mapKey, new FieldMap() ); + } + } return fieldMap; } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchemaController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchemaController.java 2016-02-27 03:14:52 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchemaController.java 2016-02-27 11:03:16 +0000 @@ -96,7 +96,7 @@ if ( fields.isEmpty() ) { - fields.add( "*,authorities[*],properties[*,constants[*]]" ); + fields.add( "*" ); } Schemas schemas = new Schemas( schemaService.getSortedSchemas() ); @@ -117,7 +117,7 @@ if ( fields.isEmpty() ) { - fields.add( "*,authorities[*],properties[*,constants[*]]" ); + fields.add( "*" ); } Schema schema = getSchemaFromType( type );