dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16718
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-09-14 15:48:18 +0700
message:
  disable EventChart (together with EventReport) import for now, too many issues
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticsType.java
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.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/common/AnalyticsType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticsType.java	2014-07-12 14:18:34 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticsType.java	2014-09-14 08:48:18 +0000
@@ -33,5 +33,5 @@
 */
 public enum AnalyticsType
 {
-    AGGREGATE, EVENT;
+    AGGREGATE, EVENT
 }

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2014-09-13 11:56:17 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2014-09-14 08:48:18 +0000
@@ -53,6 +53,7 @@
 import org.hisp.dhis.dxf2.metadata.ObjectBridge;
 import org.hisp.dhis.dxf2.metadata.handlers.ObjectHandler;
 import org.hisp.dhis.dxf2.metadata.handlers.ObjectHandlerUtils;
+import org.hisp.dhis.eventchart.EventChart;
 import org.hisp.dhis.eventreport.EventReport;
 import org.hisp.dhis.expression.Expression;
 import org.hisp.dhis.expression.ExpressionService;
@@ -158,7 +159,7 @@
             return summaryType;
         }
 
-        if ( EventReport.class.isInstance( objects.get( 0 ) ) )
+        if ( EventReport.class.isInstance( objects.get( 0 ) ) || EventChart.class.isInstance( objects.get( 0 ) ) )
         {
             return summaryType;
         }