← Back to branch summary

~stian-sandvold/dhis2/UserSettingFallback

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java

  • Committer: Stian Sandvold
  • Date: 2016-03-14 12:16:33 UTC
  • mfrom: (21871.1.422 dhis2)
  • Revision ID: stian.sandvold@gmail.com-20160314121633-ojggeaoszdunzltj
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java
30
30
 
31
31
import org.hisp.dhis.common.DimensionService;
32
32
import org.hisp.dhis.common.Grid;
33
 
import org.hisp.dhis.common.MergeStrategy;
 
33
import org.hisp.dhis.common.MergeMode;
34
34
import org.hisp.dhis.common.cache.CacheStrategy;
35
35
import org.hisp.dhis.dxf2.common.ImportOptions;
36
36
import org.hisp.dhis.dxf2.webmessage.WebMessageException;
124
124
 
125
125
        mergeReportTable( newReportTable );
126
126
 
127
 
        reportTable.mergeWith( newReportTable, MergeStrategy.MERGE_IF_NOT_NULL );
 
127
        reportTable.mergeWith( newReportTable, MergeMode.MERGE_IF_NOT_NULL );
128
128
 
129
129
        reportTableService.updateReportTable( reportTable );
130
130
    }