dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24757
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12187: change default view of Program.displayOnAllOrgunit
------------------------------------------------------------
revno: 12187
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-09-20 11:42:44 +0200
message:
change default view of Program.displayOnAllOrgunit
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-09-20 09:42:44 +0000
@@ -250,11 +250,6 @@
this.description = description;
}
- public void setOrganisationUnits( Set<OrganisationUnit> organisationUnits )
- {
- this.organisationUnits = organisationUnits;
- }
-
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -278,6 +273,11 @@
return organisationUnits;
}
+ public void setOrganisationUnits( Set<OrganisationUnit> organisationUnits )
+ {
+ this.organisationUnits = organisationUnits;
+ }
+
@JsonProperty( value = "programInstances" )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlElementWrapper( localName = "programInstances", namespace = DxfNamespaces.DXF_2_0 )
@@ -504,6 +504,7 @@
}
@JsonProperty
+ @JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Boolean getDisplayOnAllOrgunit()
{