dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2040
committer: Bharath Kumar <chbharathk@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-06-24 18:58:26 +0530
message:
  Bug fixed: Selected Orgunits are not displaying in Tree while opening definePrgramAssociation Page
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/SetupAssociationsTreeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.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-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/SetupAssociationsTreeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/SetupAssociationsTreeAction.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/SetupAssociationsTreeAction.java	2010-06-24 13:28:26 +0000
@@ -97,7 +97,7 @@
         program = programService.getProgram( id );
         
         selectionTreeManager.setSelectedOrganisationUnits( convert( program.getOrganisationUnits() ) );
-
+        
         return SUCCESS;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2010-05-18 03:42:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2010-06-24 13:28:26 +0000
@@ -648,8 +648,7 @@
 
 		<action name="defineProgramAssociationsForm"
 			class="org.hisp.dhis.patient.action.program.SetupAssociationsTreeAction">
-			<result name="success" type="chain">getProgramAssociationOptions
-			</result>
+			<result name="success" type="chain">getProgramAssociationOptions</result>
 			<param name="requiredAuthorities">F_PROGRAM_UPDATE</param>
 		</action>
 

=== 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	2010-04-28 04:59:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm	2010-06-24 13:28:26 +0000
@@ -40,7 +40,7 @@
           selectionTreeSelection.setMultipleSelectionAllowed( true );
           selectionTreeSelection.setOnSelectFunction( treeClicked );
           selectionTreeSelection.setListenerFunction( selectCompleted );
-		  selectionTree.clearSelectedOrganisationUnits();
+		  //selectionTree.clearSelectedOrganisationUnits();
           selectionTree.buildSelectionTree();
 
         </script>