dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16887
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-10-01 10:58:14 +0700
message:
  add expiryDays to dataset form in /api/me/dataSets
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.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-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java	2014-09-15 20:06:58 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java	2014-10-01 03:58:14 +0000
@@ -63,7 +63,8 @@
     private static final String KEY_PERIOD_TYPE = "periodType";
     private static final String KEY_ALLOW_FUTURE_PERIODS = "allowFuturePeriods";
     private static final String KEY_DATA_ELEMENTS = "dataElements";
-    
+    private static final String KEY_EXPIRY_DAYS = "expiryDays";
+
     public static Form fromDataSet( DataSet dataSet, boolean metaData )
     {
         Form form = new Form();
@@ -72,6 +73,7 @@
 
         form.getOptions().put( KEY_PERIOD_TYPE, dataSet.getPeriodType().getName() );
         form.getOptions().put( KEY_ALLOW_FUTURE_PERIODS, dataSet.isAllowFuturePeriods() );
+        form.getOptions().put( KEY_EXPIRY_DAYS, dataSet.getExpiryDays() );
 
         if ( dataSet.getSections().size() > 0 )
         {