← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1820: Renamed ClearSelectedOrgUnitsBeforeAction class to ClearSelectedOrganisationUnitsAction and appli...

 

------------------------------------------------------------
revno: 1820
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-04-28 11:59:07 +0700
message:
  Renamed ClearSelectedOrgUnitsBeforeAction class to ClearSelectedOrganisationUnitsAction and applied clearSelectedOrganisationUnits method of SelectionTree in oust.js file to the vm files which have the orgunit tree.
removed:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrgUnitsBeforeAction.java
added:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrganisationUnitsAction.java
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTree.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/selectionedTreeInFrame.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm


--
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-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js	2010-04-27 07:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js	2010-04-28 04:59:07 +0000
@@ -113,12 +113,12 @@
 
 function SelectionTree()
 {
-    this.clearSelectedOrgUnitsBefore = function()
+    this.clearSelectedOrganisationUnits = function()
     {
         var request = new Request();
         request.setResponseTypeXML( 'xmlObject' );
 		request.setCallbackSuccess( clearSelectedOrgUnitsCompleted );
-		request.send( selectionTreePath + 'clearSelectedOrgUnitsBefore.action' );
+		request.send( selectionTreePath + 'clearSelectedOrganisationUnits.action' );
 
     };
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTree.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTree.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTree.vm	2010-04-28 04:59:07 +0000
@@ -6,6 +6,7 @@
 <script type="text/javascript">
 	
 	selectionTreeSelection.setMultipleSelectionAllowed( true );
+	selectionTree.clearSelectedOrganisationUnits();
 	selectionTree.buildSelectionTree();
 	
 </script>

=== removed file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrgUnitsBeforeAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrgUnitsBeforeAction.java	2010-04-27 07:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrgUnitsBeforeAction.java	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-package org.hisp.dhis.oust.action;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- *   be used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.hisp.dhis.oust.manager.SelectionTreeManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- * @since 2010-04-27
- */
-public class ClearSelectedOrgUnitsBeforeAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private SelectionTreeManager selectionTreeManager;
-
-    public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
-    {
-        this.selectionTreeManager = selectionTreeManager;
-    }
-
-    // -------------------------------------------------------------------------
-    // Output
-    // -------------------------------------------------------------------------
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-    public String execute()
-    {
-        try
-        {
-            selectionTreeManager.clearSelectedOrganisationUnits();
-        }
-        catch ( Exception e )
-        {
-            message = "cannot_clear_selected_orgunits";
-
-            return ERROR;
-        }
-
-        message = "OK";
-
-        return SUCCESS;
-    }
-
-}

=== added file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrganisationUnitsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrganisationUnitsAction.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrganisationUnitsAction.java	2010-04-28 04:59:07 +0000
@@ -0,0 +1,84 @@
+package org.hisp.dhis.oust.action;
+
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hisp.dhis.oust.manager.SelectionTreeManager;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Dang Duy Hieu
+ * @version $Id$
+ * @since 2010-04-27
+ */
+public class ClearSelectedOrganisationUnitsAction
+    implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private SelectionTreeManager selectionTreeManager;
+
+    public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
+    {
+        this.selectionTreeManager = selectionTreeManager;
+    }
+
+    // -------------------------------------------------------------------------
+    // Output
+    // -------------------------------------------------------------------------
+    private String message;
+
+    public String getMessage()
+    {
+        return message;
+    }
+
+    // -------------------------------------------------------------------------
+    // Action implementation
+    // -------------------------------------------------------------------------
+    public String execute()
+    {
+        try
+        {
+            selectionTreeManager.clearSelectedOrganisationUnits();
+        }
+        catch ( Exception e )
+        {
+            message = "cannot_clear_selected_orgunits";
+
+            return ERROR;
+        }
+
+        message = "OK";
+
+        return SUCCESS;
+    }
+
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2010-04-27 07:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2010-04-28 04:59:07 +0000
@@ -259,8 +259,8 @@
 		</property>
 	</bean>
 	
-	<bean id="org.hisp.dhis.oust.action.ClearSelectedOrgUnitsBeforeAction"
-		class="org.hisp.dhis.oust.action.ClearSelectedOrgUnitsBeforeAction"
+	<bean id="org.hisp.dhis.oust.action.ClearSelectedOrganisationUnitsAction"
+		class="org.hisp.dhis.oust.action.ClearSelectedOrganisationUnitsAction"
 		scope="prototype">
 		<property name="selectionTreeManager">
 			<ref local="org.hisp.dhis.oust.manager.SelectionTreeManager" />

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2010-04-27 07:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2010-04-28 04:59:07 +0000
@@ -152,8 +152,8 @@
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 		
-		<action name="clearSelectedOrgUnitsBefore"
-			class="org.hisp.dhis.oust.action.ClearSelectedOrgUnitsBeforeAction">
+		<action name="clearSelectedOrganisationUnits"
+			class="org.hisp.dhis.oust.action.ClearSelectedOrganisationUnitsAction">
 			<result name="success" type="velocity-xml">
 				/dhis-web-commons/ouwt/responseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
@@ -525,7 +525,7 @@
 			<result name="input" type="velocity">
 				/dhis-web-commons/useraccount/updateUserInput.vm</result>
 		</action>
-
+		
 	</package>
 
 </struts>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm	2010-02-27 21:18:45 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm	2010-04-28 04:59:07 +0000
@@ -24,6 +24,7 @@
 			
             <script type="text/javascript">
                 selectionTreeSelection.setMultipleSelectionAllowed( true );
+				selectionTree.clearSelectedOrganisationUnits();
                 selectionTree.buildSelectionTree();
             </script>
 			

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2010-04-13 02:28:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm	2010-04-28 04:59:07 +0000
@@ -108,6 +108,7 @@
     selectionTreeSelection.setMultipleSelectionAllowed( true );
     selectionTreeSelection.setOnSelectFunction( treeClicked );
     selectionTreeSelection.setListenerFunction( selectCompleted );
+	selectionTree.clearSelectedOrganisationUnits();
     selectionTree.buildSelectionTree();
 
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm	2010-02-23 19:44:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm	2010-04-28 04:59:07 +0000
@@ -6,6 +6,7 @@
 <script type="text/javascript">
     selectionTreeSelection.setMultipleSelectionAllowed( false );
     selectionTreeSelection.setListenerFunction( treeSelected );
+	selectionTree.clearSelectedOrganisationUnits();
     selectionTree.buildSelectionTree();
 </script>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm	2010-04-12 16:35:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/pruneOrganisationUnitForm.vm	2010-04-28 04:59:07 +0000
@@ -6,6 +6,7 @@
 <script type="text/javascript">
     selectionTreeSelection.setMultipleSelectionAllowed( false );
     selectionTreeSelection.setListenerFunction( treeSelected );
+	selectionTree.clearSelectedOrganisationUnits();
     selectionTree.buildSelectionTree();
 </script>
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/selectionedTreeInFrame.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/selectionedTreeInFrame.vm	2009-09-22 22:20:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/selectionedTreeInFrame.vm	2010-04-28 04:59:07 +0000
@@ -26,6 +26,7 @@
                       selectionTreeSelection.setMultipleSelectionAllowed( true );
                       selectionTreeSelection.setOnSelectFunction( treeClicked );
                       selectionTreeSelection.setListenerFunction( selectCompleted );
+					  selectionTree.clearSelectedOrganisationUnits();
                       selectionTree.buildSelectionTree();				  
                 </script>  			
                 <script type="text/javascript">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm	2009-11-03 09:05:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetAssociations.vm	2010-04-28 04:59:07 +0000
@@ -40,6 +40,7 @@
           selectionTreeSelection.setMultipleSelectionAllowed( true );
           selectionTreeSelection.setOnSelectFunction( treeClicked );
           selectionTreeSelection.setListenerFunction( selectCompleted );
+		  selectionTree.clearSelectedOrganisationUnits();
           selectionTree.buildSelectionTree();
 
         </script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-04-27 07:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/showAssignMultiDataSetForm.vm	2010-04-28 04:59:07 +0000
@@ -107,7 +107,7 @@
 			selectionTreeSelection.setMultipleSelectionAllowed( true );
 			selectionTreeSelection.setOnSelectFunction( treeClicked );
 			selectionTreeSelection.setListenerFunction( selectCompleted );
-			selectionTree.clearSelectedOrgUnitsBefore();
+			selectionTree.clearSelectedOrganisationUnits();
 			selectionTree.buildSelectionTree();
 
 			var numberOfSelects = 0;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm	2010-02-17 13:38:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm	2010-04-28 04:59:07 +0000
@@ -63,6 +63,7 @@
 			selectionTreeSelection.setMultipleSelectionAllowed( true );
 			selectionTreeSelection.setOnSelectFunction( treeClicked );
 			selectionTreeSelection.setListenerFunction( selectCompleted );
+			selectionTree.clearSelectedOrganisationUnits();
 			selectionTree.buildSelectionTree();
 
 			var numberOfSelects = 0;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm	2010-02-09 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm	2010-04-28 04:59:07 +0000
@@ -65,6 +65,7 @@
 			selectionTreeSelection.setMultipleSelectionAllowed( true );
 			selectionTreeSelection.setOnSelectFunction( treeClicked );
 			selectionTreeSelection.setListenerFunction( selectCompleted );
+			selectionTree.clearSelectedOrganisationUnits();
 			selectionTree.buildSelectionTree();
 
 			var numberOfSelects = 0;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm	2009-10-10 08:57:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm	2010-04-28 04:59:07 +0000
@@ -40,6 +40,7 @@
           selectionTreeSelection.setMultipleSelectionAllowed( true );
           selectionTreeSelection.setOnSelectFunction( treeClicked );
           selectionTreeSelection.setListenerFunction( selectCompleted );
+		  selectionTree.clearSelectedOrganisationUnits();
           selectionTree.buildSelectionTree();
 
         </script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm	2010-04-04 11:24:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm	2010-04-28 04:59:07 +0000
@@ -20,6 +20,8 @@
 				});
 				jQuery.validator.loadLocaled( jQuery("#curLocaleCode").val() );
 				jQuery("#username").focus();
+				
+				selectionTree.clearSelectedOrganisationUnits();
 				selectionTree.buildSelectionTree();
 			}
 	);

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm	2010-04-04 11:24:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm	2010-04-28 04:59:07 +0000
@@ -144,6 +144,7 @@
 
 <script type="text/javascript">
 
+	selectionTree.clearSelectedOrganisationUnits();
 	selectionTree.buildSelectionTree();
 
 	var surnameField = document.getElementById( 'surname' );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2010-04-27 07:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2010-04-28 04:59:07 +0000
@@ -51,7 +51,7 @@
         <div id="selectionTree" style="width:40em;height:30em;overflow:auto;border:1px solid #cccccc">			
 			<script type="text/javascript">
           		selectionTreeSelection.setMultipleSelectionAllowed( false );
-				selectionTree.clearSelectedOrgUnitsBefore();
+				selectionTree.clearSelectedOrganisationUnits();
           		selectionTree.buildSelectionTree();
         	</script>										
 		</div>		

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm	2010-04-27 07:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm	2010-04-28 04:59:07 +0000
@@ -49,7 +49,7 @@
         <div id="selectionTree" style="width:40em;height:30em;overflow:auto;border:1px solid #cccccc">			
 			<script type="text/javascript">
           		selectionTreeSelection.setMultipleSelectionAllowed( false );
-				selectionTree.clearSelectedOrgUnitsBefore();
+				selectionTree.clearSelectedOrganisationUnits();
           		selectionTree.buildSelectionTree();
         	</script>
 		</div>	

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2010-04-27 07:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2010-04-28 04:59:07 +0000
@@ -11,7 +11,7 @@
 		            
 		    <script type="text/javascript">
 		        selectionTreeSelection.setMultipleSelectionAllowed( false );
-				selectionTree.clearSelectedOrgUnitsBefore();
+				selectionTree.clearSelectedOrganisationUnits();
 		        selectionTree.buildSelectionTree();
 		    </script>
         </td>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm	2010-02-24 17:04:30 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm	2010-04-28 04:59:07 +0000
@@ -87,6 +87,7 @@
           		selectionTreeSelection.setMultipleSelectionAllowed( false );
           		// selectionTreeSelection.setOnSelectFunction( treeClicked );
           		// selectionTreeSelection.setListenerFunction( selectCompleted );
+				selectionTree.clearSelectedOrganisationUnits();
           		selectionTree.buildSelectionTree();
 
         	</script>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm	2010-02-24 17:04:30 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm	2010-04-28 04:59:07 +0000
@@ -66,6 +66,7 @@
 
 <script type="text/javascript">
 	selectionTreeSelection.setMultipleSelectionAllowed( true );
+	selectionTree.clearSelectedOrganisationUnits();
 	selectionTree.buildSelectionTree();
 	
 	Calendar.setup({