dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 800
committer: brajesh2murari@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-09-29 15:12:30 +0530
message:
  minor-fix
added:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseExpand.vm
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/SelectLevelAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/UnselectLevelAction.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-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/SelectLevelAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/SelectLevelAction.java	2009-09-28 22:49:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/SelectLevelAction.java	2009-09-29 09:42:30 +0000
@@ -104,7 +104,8 @@
                              	      	        	
          selectedUnitsForLock.addAll(selectionTreeManager.getLockOnSelectedOrganisationUnits());
          selectionTreeManager.setLockOnSelectedOrganisationUnits( selectedUnitsForLock ) ;
-                  
+                
+         selectLevel = level;
          return SUCCESS;
         }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/UnselectLevelAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/UnselectLevelAction.java	2009-09-28 22:49:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/UnselectLevelAction.java	2009-09-29 09:42:30 +0000
@@ -103,7 +103,8 @@
 	    selectionTreeManager.setSelectedOrganisationUnits( selectedUnits );
 	    locksLeftOnSelectedUnits.removeAll( selectedUnitsForUnLock );
 	    selectionTreeManager.setLockOnSelectedOrganisationUnits( locksLeftOnSelectedUnits );
-	   	    
+	   	
+	    selectLevel = level;
 	    return SUCCESS;
 	}
 		

=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseExpand.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseExpand.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseExpand.vm	2009-09-29 09:42:30 +0000
@@ -0,0 +1,9 @@
+<units>
+#foreach( $parent in $parents )
+	<parent parentId="$parent.id">
+	#foreach( $child in $childrenMap.get( $parent ) )
+  		<child id="$child.id" hasChildren="$child.children.size()">$encoder.xmlEncode( $child.name )</child>
+  	#end
+  	</parent>
+#end
+</units>
\ No newline at end of file