dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18655
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2015-03-22 14:12:15 +0700
message:
  minor fix, add sortOrder to Section.mergeWith
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.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/dataset/Section.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java	2015-03-18 13:07:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java	2015-03-22 07:12:15 +0000
@@ -274,6 +274,7 @@
         if ( other.getClass().isInstance( this ) )
         {
             Section section = (Section) other;
+            sortOrder = section.getSortOrder();
 
             if ( strategy.isReplace() )
             {