=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2013-09-04 12:45:06 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2013-09-09 12:47:56 +0000 @@ -37,6 +37,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import org.apache.commons.lang.Validate; import org.hisp.dhis.common.view.DetailedView; +import org.hisp.dhis.common.view.SharingView; import org.hisp.dhis.user.User; import org.hisp.dhis.user.UserGroupAccess; @@ -250,7 +251,7 @@ @Override @JsonProperty - @JsonView( { DetailedView.class } ) + @JsonView( { SharingView.class, DetailedView.class } ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public String getPublicAccess() { @@ -264,7 +265,7 @@ @Override @JsonProperty - @JsonView( { DetailedView.class } ) + @JsonView( { SharingView.class, DetailedView.class } ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public boolean getExternalAccess() { @@ -278,7 +279,7 @@ @Override @JsonProperty - @JsonView( { DetailedView.class } ) + @JsonView( { SharingView.class, DetailedView.class } ) @JsonSerialize( as = BaseIdentifiableObject.class ) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 ) public User getUser() @@ -292,7 +293,7 @@ } @JsonProperty - @JsonView( { DetailedView.class } ) + @JsonView( { SharingView.class, DetailedView.class } ) @JacksonXmlElementWrapper( localName = "userGroupAccesses", namespace = DxfNamespaces.DXF_2_0 ) @JacksonXmlProperty( localName = "userGroupAccess", namespace = DxfNamespaces.DXF_2_0 ) public Set getUserGroupAccesses() @@ -306,7 +307,7 @@ } @JsonProperty - @JsonView( { DetailedView.class } ) + @JsonView( { SharingView.class, DetailedView.class } ) @JacksonXmlProperty( localName = "access", namespace = DxfNamespaces.DXF_2_0 ) public Access getAccess() { === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/SharingView.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/SharingView.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/SharingView.java 2013-09-09 12:47:56 +0000 @@ -0,0 +1,36 @@ +package org.hisp.dhis.common.view; + +/* + * Copyright (c) 2004-2013, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Morten Olav Hansen + */ +public class SharingView extends BasicView +{ +} === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2013-08-28 11:47:51 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2013-09-09 12:47:56 +0000 @@ -40,6 +40,7 @@ import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.DimensionalView; import org.hisp.dhis.common.view.ExportView; +import org.hisp.dhis.common.view.SharingView; import org.hisp.dhis.common.view.ShortNameView; import org.hisp.dhis.common.view.UuidView; @@ -92,6 +93,7 @@ viewClasses.put( "default", BasicView.class ); viewClasses.put( "basic", BasicView.class ); + viewClasses.put( "sharing", SharingView.class ); viewClasses.put( "shortName", ShortNameView.class ); viewClasses.put( "detailed", DetailedView.class ); viewClasses.put( "uuid", UuidView.class );