dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3301 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-04-06 17:30:05 +0200
message:
  (GIS) All orgunittree levels sorted.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitChildren.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css


--
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/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2011-04-06 14:47:13 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2011-04-06 15:27:43 +0000
@@ -166,7 +166,9 @@
     public List<OrganisationUnit> getSortedChildren()
     {
         List<OrganisationUnit> sortedChildren = new ArrayList<OrganisationUnit>( children );
+        
         Collections.sort( sortedChildren, COMPARATOR );
+        
         return sortedChildren;
     }
     

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitChildren.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitChildren.vm	2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitChildren.vm	2011-04-06 15:27:43 +0000
@@ -10,7 +10,7 @@
   "children": [
   #set( $innerSize = $unit.children.size() )
   #set( $level = $unit.level + 1 )
-#foreach( $child in $unit.children )
+#foreach( $child in $unit.getSortedChildren() )
   {
     "id": ${child.id},
     "level": ${level},

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-04-06 11:44:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-04-06 15:27:43 +0000
@@ -32,13 +32,13 @@
 .x-tree .x-panel-body {
 	background-color:#F8F8F8;
 }
-.x-tree-node-leaf .x-tree-node-icon {
+#layertree_tp .x-tree-node-leaf .x-tree-node-icon {
+    background:url('../../../images/settings_small.png') center center no-repeat;
+}
+#orgunittree .x-tree-node-leaf .x-tree-node-icon {
     background:url('../../resources/ext-ux/theme/gray-extend-ux/leaf.gif') center center;
     padding-right:1px;
 }
-#layertree_tp .x-tree-node-leaf .x-tree-node-icon {
-    background:url('../../../images/settings_small.png') center center no-repeat;
-}
 .x-btn-tl, .x-btn-tr, .x-btn-tc, .x-btn-ml, .x-btn-mr, .x-btn-mc, .x-btn-bl, .x-btn-br, .x-btn-bc {
 	background-image:url('../../resources/ext-ux/theme/gray-extend-ux/btn.gif');
 }