dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40650
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20649: Configuration, annotation of infrastructuralPeriodType
------------------------------------------------------------
revno: 20649
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-10-12 19:21:41 +0200
message:
Configuration, annotation of infrastructuralPeriodType
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.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/configuration/Configuration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2015-10-09 10:49:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2015-10-12 17:21:41 +0000
@@ -34,6 +34,7 @@
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
+import org.hisp.dhis.common.adapter.JacksonPeriodTypeSerializer;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -203,6 +204,7 @@
}
@JsonProperty
+ @JsonSerialize( using = JacksonPeriodTypeSerializer.class )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public PeriodType getInfrastructuralPeriodType()
{