dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9910
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-02-26 20:53:54 +0100
message:
  Report table, startup routine
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.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/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2013-02-26 19:12:22 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2013-02-26 19:53:54 +0000
@@ -535,7 +535,7 @@
     /**
      * Populates the presentation properties based on the persisted properties.
      */
-    public ReportTable populatePresentationProperties()
+    public ReportTable populatePresentationProps()
     {
         ListMap<String, DataElementGroup> degs = new ListMap<String, DataElementGroup>();
         
@@ -562,7 +562,7 @@
     /**
      * Sets the persisted properties based on the presentation properties.
      */
-    public ReportTable readPresentationProperties()
+    public ReportTable readPresentationProps()
     {
         dataElementGroups.clear();        
         organisationUnitGroups.clear();

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-02-12 06:55:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-02-26 19:53:54 +0000
@@ -425,6 +425,9 @@
         executeSql( "update reporttable set lastfinancialyear = false where lastfinancialyear is null" );
         executeSql( "update reporttable set last5financialyears = false where last5financialyears is null" );
         executeSql( "update reporttable set cumulative = false where cumulative is null" );
+        executeSql( "update reporttable set subtotals = false where subtotals is null" );
+        executeSql( "update reporttable set userOrganisationUnit = false where userOrganisationUnit is null" );
+        executeSql( "update reporttable set userOrganisationUnitChildren = false where userOrganisationUnitChildren is null" );
 
         executeSql( "update chart set reportingmonth = false where reportingmonth is null" );
         executeSql( "update chart set reportingbimonth = false where reportingbimonth is null" );