=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DefineDeTargetAssociationsAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DefineDeTargetAssociationsAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/detarget/action/DefineDeTargetAssociationsAction.java	2011-06-17 10:54:43 +0000
@@ -26,14 +26,11 @@
  */
 package org.hisp.dhis.detarget.action;
 
-import java.util.Collection;
 import java.util.HashSet;
-import java.util.Set;
 
 import org.hisp.dhis.detarget.DeTarget;
 import org.hisp.dhis.detarget.DeTargetService;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.oust.manager.SelectionTreeManager;
 
 import com.opensymphony.xwork2.Action;
@@ -64,14 +61,14 @@
     {
         this.deTargetService = deTargetService;
     }
-    
+/*    
     private OrganisationUnitService organisationUnitService;
 
     public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
     {
         this.organisationUnitService = organisationUnitService;
     }
-
+*/
  
     // -------------------------------------------------------------------------
     // Getters & Setters
@@ -91,17 +88,27 @@
     public String execute() throws Exception
     {
         
-        Collection<OrganisationUnit> rootUnits = selectionTreeManager.getRootOrganisationUnits(); 
-        
-        Set<OrganisationUnit> unitsInTheTree = new HashSet<OrganisationUnit>();        
-        
+        DeTarget deTarget = deTargetService.getDeTarget( deTargetId );
+        
+        deTarget.updateOrganisationUnits( new HashSet<OrganisationUnit>( selectionTreeManager.getReloadedSelectedOrganisationUnits() ) );
+        
+        deTargetService.updateDeTarget( deTarget );
+        
+        //Collection<OrganisationUnit> rootUnits = selectionTreeManager.getRootOrganisationUnits(); 
+        
+        //Set<OrganisationUnit> unitsInTheTree = new HashSet<OrganisationUnit>();  
+        
+        //getUnitsInTheTree( rootUnits, unitsInTheTree ); 
+        /*
         DeTarget deTarget = deTargetService.getDeTarget( deTargetId );            
         
         System.out.println( " DeTarget Id : "  + deTarget.getId() + " DETarget Name "  + deTarget.getName() );
         
         Set<OrganisationUnit> assignedSources = deTarget.getSources();
         
-        assignedSources.removeAll( unitsInTheTree );        
+        //assignedSources.removeAll( unitsInTheTree );
+        
+        assignedSources.removeAll( assignedSources );  
 
         Collection<OrganisationUnit> selectedOrganisationUnits = selectionTreeManager.getReloadedSelectedOrganisationUnits();
         
@@ -112,8 +119,22 @@
         System.out.println( " size of selected Organisation Units : "  + selectedOrganisationUnits.size() + " Size of assigned Sources "  + assignedSources.size() );
         
         deTargetService.updateDeTarget( deTarget );
-        
+        */
         return SUCCESS;
     }
+    
+    // -------------------------------------------------------------------------
+    // Supportive methods
+    // -------------------------------------------------------------------------
+/*    
+    private void getUnitsInTheTree( Collection<OrganisationUnit> rootUnits, Set<OrganisationUnit> unitsInTheTree )
+    {
+        for( OrganisationUnit root : rootUnits )
+        {
+                unitsInTheTree.add( root );
+                getUnitsInTheTree( root.getChildren(), unitsInTheTree );                
+        }
+    }
+    */
 }
 

=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/DefineSurveyAssociationsAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/DefineSurveyAssociationsAction.java	2011-04-27 17:15:13 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/DefineSurveyAssociationsAction.java	2011-06-17 10:54:43 +0000
@@ -27,9 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
 import java.util.HashSet;
-import java.util.Set;
 
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.oust.manager.SelectionTreeManager;
@@ -82,17 +80,26 @@
         throws Exception
     {
     	
-        Collection<OrganisationUnit> rootUnits = selectionTreeManager.getRootOrganisationUnits(); 
-        
-        Set<OrganisationUnit> unitsInTheTree = new HashSet<OrganisationUnit>();        
-        
-        getUnitsInTheTree( rootUnits, unitsInTheTree );          
+        Survey survey = surveyService.getSurvey( surveyId ); 
+        
+        survey.updateOrganisationUnits( new HashSet<OrganisationUnit>( selectionTreeManager.getReloadedSelectedOrganisationUnits() ) );
+        
+        surveyService.updateSurvey( survey );
+        
+        //Collection<OrganisationUnit> rootUnits = selectionTreeManager.getRootOrganisationUnits(); 
+        
+       // Set<OrganisationUnit> unitsInTheTree = new HashSet<OrganisationUnit>();        
+        
+        //getUnitsInTheTree( rootUnits, unitsInTheTree );          
 	
+        /*
         Survey survey = surveyService.getSurvey( surveyId );    	
     	
     	Set<OrganisationUnit> assignedSources = survey.getSources();
     	
-    	assignedSources.removeAll( unitsInTheTree );        
+    	assignedSources.removeAll( assignedSources );
+    	
+    	//assignedSources.removeAll( unitsInTheTree );        
 
     	Collection<OrganisationUnit> selectedOrganisationUnits = selectionTreeManager.getSelectedOrganisationUnits();
     	
@@ -101,14 +108,14 @@
     	survey.setSources( assignedSources );
     	
     	surveyService.updateSurvey( survey );
-        
+        */
         return SUCCESS;
     }
 
     // -------------------------------------------------------------------------
     // Supportive methods
     // -------------------------------------------------------------------------
-    
+/*    
     private void getUnitsInTheTree( Collection<OrganisationUnit> rootUnits, Set<OrganisationUnit> unitsInTheTree )
     {
     	for( OrganisationUnit root : rootUnits )
@@ -117,4 +124,5 @@
     		getUnitsInTheTree( root.getChildren(), unitsInTheTree );    		
         }
     }
+    */
 }

=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/GetSurveyAction.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/GetSurveyAction.java	2010-09-15 13:23:57 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/GetSurveyAction.java	2011-06-17 10:54:43 +0000
@@ -28,10 +28,13 @@
  */
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.hisp.dhis.dataentryform.DataEntryForm;
 import org.hisp.dhis.indicator.Indicator;
+import org.hisp.dhis.indicator.IndicatorGroup;
+import org.hisp.dhis.indicator.IndicatorService;
 import org.hisp.dhis.survey.Survey;
 import org.hisp.dhis.survey.SurveyService;
 
@@ -44,7 +47,7 @@
 public class GetSurveyAction
     implements Action
 {
-    private int surveyId;
+
 
     private Survey survey;
 
@@ -63,20 +66,33 @@
     {
         this.surveyService = surveyService;
     }
-
+    
+    private IndicatorService indicatorService;
+
+    public void setIndicatorService( IndicatorService indicatorService )
+    {
+        this.indicatorService = indicatorService;
+    }
+
+    
     // -------------------------------------------------------------------------
     // Getters & Setters
     // -------------------------------------------------------------------------
 
-    public int getSurveyId()
+    private Integer surveyId;
+    
+
+    public void setSurveyId( Integer surveyId )
+    {
+        this.surveyId = surveyId;
+    }
+    
+    
+    public Integer getSurveyId()
     {
         return surveyId;
     }
 
-    public void setSurveyId( int surveyId )
-    {
-        this.surveyId = surveyId;
-    }
 
     public Survey getSurvey()
     {
@@ -104,7 +120,38 @@
     {
         return description;
     }
-
+    
+    // -------------------------------------------------------------------------
+    // Getters & Setters
+    // -------------------------------------------------------------------------
+
+    private List<IndicatorGroup> indicatorGroups;
+    
+    public List<IndicatorGroup> getIndicatorGroups()
+    {
+        return indicatorGroups;
+    }
+    
+    private String indicatorGroupId;
+    
+    public void setIndicatorGroupId( String indicatorGroupId )
+    {
+        this.indicatorGroupId = indicatorGroupId;
+    }
+    
+    private String selectedIndicators[];
+    
+    public void setSelectedIndicators( String[] selectedIndicators )
+    {
+        this.selectedIndicators = selectedIndicators;
+    }
+
+    private List<Indicator> indicators;
+    
+    public List<Indicator> getIndicators()
+    {
+        return indicators;
+    }
     // -------------------------------------------------------------------------
     // Action
     // -------------------------------------------------------------------------
@@ -116,12 +163,52 @@
     	
     	surveyIndicators = new ArrayList<Indicator>( survey.getIndicators() );
     	
+    	indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
+    	
         //Collections.sort( surveyIndicators, dataElementComparator );       
                 	
         //displayPropertyHandler.handle( dataSetDataElements );
 
         //dataEntryForm = dataEntryFormService.getDataEntryFormByDataSet( dataSet );
-        
+    	
+    	
+        if (  indicatorGroupId == null || indicatorGroupId.equalsIgnoreCase( "ALL" ) )
+        {
+                indicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
+        }
+        else
+        {
+                IndicatorGroup indicatorGroup = indicatorService.getIndicatorGroup( Integer.parseInt( indicatorGroupId ) );
+
+                indicators = new ArrayList<Indicator>( indicatorGroup.getMembers() );
+        }
+       // System.out.println("\n\n +++ \n selectedIndicators list  is  : " + selectedIndicators + " ,selectedIndicators list size is : "  + selectedIndicators.length );
+        if ( selectedIndicators != null && selectedIndicators.length > 0 )
+        {
+            Iterator<Indicator> iter = indicators.iterator();
+
+            while ( iter.hasNext() )
+            {
+                Indicator indicator = iter.next();
+                //System.out.println("\n\n +++ \n Indicator Id is   : " + indicator.getId() + " , Indicator name is :" + indicator.getName() );
+                
+                for ( int i = 0; i < selectedIndicators.length; i++ )
+                {
+                    //System.out.println("\n\n +++ \n Indicator Id is   : " + indicator.getId() + " , Indicator name is :" + indicator.getName() );
+                    if ( indicator.getId() == Integer.parseInt( selectedIndicators[i] ) )
+                    {
+                        iter.remove();
+                    }
+                }
+            }
+        }
+
+        if ( surveyId != null )
+        {
+                Survey survey = surveyService.getSurvey( surveyId );
+
+                indicators.removeAll( survey.getIndicators() );
+        }
         return SUCCESS;
     }
 }

=== modified file 'local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/IndicatorListFilteredByGroup.java'
--- local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/IndicatorListFilteredByGroup.java	2010-12-29 07:53:18 +0000
+++ local/in/dhis-web-survey/src/main/java/org/hisp/dhis/survey/action/IndicatorListFilteredByGroup.java	2011-06-17 10:54:43 +0000
@@ -109,6 +109,8 @@
     public String execute()
         throws Exception
     {
+        //System.out.println("\n\n +++ \n indicatorGroupId   is  : " + indicatorGroupId ); 
+        
         if (  indicatorGroupId == null || indicatorGroupId.equalsIgnoreCase( "ALL" ) )
         {
         	indicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );

=== modified file 'local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml	2011-01-20 13:19:33 +0000
+++ local/in/dhis-web-survey/src/main/resources/META-INF/dhis/beans.xml	2011-06-17 10:54:43 +0000
@@ -83,7 +83,7 @@
       <ref bean="org.hisp.dhis.survey.SurveyService"/>
     </property>
    </bean>
-
+<!--
 	<bean
     id="org.hisp.dhis.survey.action.IndicatorGroupListAction"
     class="org.hisp.dhis.survey.action.IndicatorGroupListAction"
@@ -92,7 +92,7 @@
       <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
     </property>	
 	</bean>
-	
+-->		
 	<bean
     id="org.hisp.dhis.survey.action.IndicatorListFilteredByGroup"
     class="org.hisp.dhis.survey.action.IndicatorListFilteredByGroup"
@@ -104,7 +104,7 @@
       <ref bean="org.hisp.dhis.survey.SurveyService"/>
     </property>	
 	</bean>
-	
+
 	<bean
     id="org.hisp.dhis.survey.action.DelSurveyAction"
     class="org.hisp.dhis.survey.action.DelSurveyAction"
@@ -144,9 +144,12 @@
     scope="prototype">
 	  <property name="surveyService">
       <ref bean="org.hisp.dhis.survey.SurveyService"/>
-    </property>	
+    </property>
+	<property name="indicatorService">
+      <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
+    </property>
 	</bean>
-	
+<!--	
 	<bean
     id="org.hisp.dhis.survey.action.GetNumberOfLevelsAction"
     class="org.hisp.dhis.survey.action.GetNumberOfLevelsAction"
@@ -164,7 +167,7 @@
       <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
     </property>	
 	</bean>
-	
+-->	
 	<bean
     id="org.hisp.dhis.survey.action.SetupAssociationsTreeAction"
     class="org.hisp.dhis.survey.action.SetupAssociationsTreeAction"
@@ -176,7 +179,7 @@
       <ref bean="org.hisp.dhis.survey.SurveyService"/>
     </property>	
 	</bean>
-	
+<!--	
 	<bean
     id="org.hisp.dhis.survey.action.UnselectAllAction"
     class="org.hisp.dhis.survey.action.UnselectAllAction"
@@ -194,7 +197,7 @@
       <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
     </property>	
 	</bean>
-	
+-->	
 	<bean
     id="org.hisp.dhis.survey.action.UpdateSurveyAction"
     class="org.hisp.dhis.survey.action.UpdateSurveyAction"
@@ -381,12 +384,12 @@
 
 	<!-- DeTarget Association -->
 	
-	<bean id="org.hisp.dhis.detarget.action.GetNumberOfLevelsAction"
+<!--	<bean id="org.hisp.dhis.detarget.action.GetNumberOfLevelsAction"
     class="org.hisp.dhis.detarget.action.GetNumberOfLevelsAction" scope="prototype">
       <property name="organisationUnitService">
       <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
     </property>     
-    </bean>	
+    </bean>	-->
 	
 	<bean id="org.hisp.dhis.detarget.action.SetupAssociationsTreeAction"
     class="org.hisp.dhis.detarget.action.SetupAssociationsTreeAction"
@@ -409,8 +412,8 @@
     <property name="deTargetService">
       <ref bean="org.hisp.dhis.detarget.DeTargetService"/>
     </property>
-	<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService">
-	</property>
+<!--<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService">
+	</property>-->
     </bean>
 	
 	<!-- Edit DeTarget Form  -->

=== modified file 'local/in/dhis-web-survey/src/main/resources/struts.xml'
--- local/in/dhis-web-survey/src/main/resources/struts.xml	2011-01-17 07:45:29 +0000
+++ local/in/dhis-web-survey/src/main/resources/struts.xml	2011-06-17 10:54:43 +0000
@@ -18,30 +18,38 @@
 		
 		<!-- Edit Survey Form  -->
 		
-		<action name="editSurveyForm"
+<!--		<action name="editSurveyForm"
 			class="org.hisp.dhis.survey.action.IndicatorListFilteredByGroup">
 			<result name="success" type="chain">
 				<param name="actionName">indicatorGroupListEditChain</param>
-			</result>
+			</result>-->
 			<!--<param name="requiredAuthorities">F_SURVEY_UPDATE</param>-->
-		</action>
+<!--		</action>-->
 		
-		<action name="indicatorGroupListEditChain"
+<!--		<action name="indicatorGroupListEditChain"
 			class="org.hisp.dhis.survey.action.IndicatorGroupListAction">
 			<result name="success" type="chain">
 				<param name="actionName">getSurveyEditChain</param>
-			</result>
+			</result>-->
 			<!--<param name="requiredAuthorities">F_SURVEY_UPDATE</param>-->
-		</action>
-		
+<!--		</action>-->
+<!--		
 		<action name="getSurveyEditChain"
 			class="org.hisp.dhis.survey.action.GetSurveyAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-survey/editSurvey.vm</param>
-			<param name="javascripts">
-				javascript/survey.js,javascript/IndicatorList.js </param>
-			<!--<param name="requiredAuthorities">F_SURVEY_UPDATE</param>-->
-		</action>
+			<param name="javascripts">javascript/survey.js,javascript/IndicatorList.js </param>-->
+			<!--<param name="requiredAuthorities">F_SURVEY_UPDATE</param>-->
+<!--		</action>-->
+		
+		<action name="editSurveyForm"
+			class="org.hisp.dhis.survey.action.GetSurveyAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-survey/editSurvey.vm</param>
+			<param name="javascripts">javascript/survey.js,javascript/IndicatorList.js </param>
+			<!--<param name="requiredAuthorities">F_SURVEY_UPDATE</param>-->
+		</action>		
+		
 		
 		<action name="updateSurvey"
 			class="org.hisp.dhis.survey.action.UpdateSurveyAction">
@@ -95,71 +103,69 @@
 		
 		<action name="filterAvailableIndicatorsByIndicatorGroup"
 			class="org.hisp.dhis.survey.action.IndicatorListFilteredByGroup">
-			<result name="success" type="velocity-xml">
-				/dhis-web-survey/responseIndicatorGroup.vm</result>
+			<result name="success" type="velocity-xml">/dhis-web-survey/responseIndicatorGroup.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 			<param name="javascripts">javascript/survey.js</param>
 		</action>
 		
 		<!-- Survry Association -->
 		
+<!--		<action name="defineSurveyAssociationsForm"
+			class="org.hisp.dhis.survey.action.GetNumberOfLevelsAction">
+			<result name="success" type="chain">
+				defineSurveyAssociationsFormChain</result>-->
+			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
+<!--		</action>-->
+		
+<!--		<action name="defineSurveyAssociationsFormChain"
+			class="org.hisp.dhis.survey.action.SetupAssociationsTreeAction">
+			<result name="success" type="velocity">/main.vm</result>
+			<param name="page">/dhis-web-survey/surveyAssociations.vm</param>
+			<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/IndicatorList.js,javascript/associations.js</param>-->
+			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
+<!--		</action>-->
+
 		<action name="defineSurveyAssociationsForm"
-			class="org.hisp.dhis.survey.action.GetNumberOfLevelsAction">
-			<result name="success" type="chain">
-				defineSurveyAssociationsFormChain</result>
-			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
-		</action>
-		
-		<action name="defineSurveyAssociationsFormChain"
 			class="org.hisp.dhis.survey.action.SetupAssociationsTreeAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-survey/surveyAssociations.vm</param>
 			<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/IndicatorList.js,javascript/associations.js</param>
 			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
-		</action>
+		</action>		
 		
+				
 		<action name="defineSurveyAssociations"
 			class="org.hisp.dhis.survey.action.DefineSurveyAssociationsAction">
 			<result name="success" type="redirect">index.action</result>
-			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
 		</action>
 		
-		<action name="selectLevel"
+<!--		<action name="selectLevel"
 			class="org.hisp.dhis.survey.action.SelectLevelAction">
-			<result name="success" type="chain">
-				getNumberOfLevelsSelectLevelChain</result>
-			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
+			<result name="success" type="chain">getNumberOfLevelsSelectLevelChain</result>
 		</action>
 		
 		<action name="unselectLevel"
 			class="org.hisp.dhis.survey.action.UnselectLevelAction">
-			<result name="success" type="chain">
-				getNumberOfLevelsSelectLevelChain</result>
-			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
+			<result name="success" type="chain">getNumberOfLevelsSelectLevelChain</result>
 		</action>
 		
 		<action name="unselectAll"
 			class="org.hisp.dhis.survey.action.UnselectAllAction">
-			<result name="success" type="chain">
-				getNumberOfLevelsSelectLevelChain</result>
-			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
+			<result name="success" type="chain">getNumberOfLevelsSelectLevelChain</result>
 		</action>
 		
 		<action name="getNumberOfLevelsSelectLevelChain"
 			class="org.hisp.dhis.survey.action.GetNumberOfLevelsAction">
 			<result name="success" type="chain">getSurveySelectLevelChain</result>
-			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
 		</action>
 		
 		<action name="getSurveySelectLevelChain"
 			class="org.hisp.dhis.survey.action.GetSurveyAction">
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-survey/surveyAssociations.vm</param>
-			<param name="javascripts">
-				../dhis-web-commons/oust/oust.js,javascript/IndicatorsList.js,javascript/associations.js</param>
-			<!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
+			<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/IndicatorsList.js,javascript/associations.js</param>
 		</action>
-		
+-->		
 		<action name="getSurvey"
 			class="org.hisp.dhis.survey.action.GetSurveyAction">
 			<result name="success" type="velocity-xml">/dhis-web-survey/responseSurveyObject.vm</result>
@@ -345,20 +351,29 @@
 		
 		<!-- DeTarget Association -->
         
-       <action name="defineDeTargetAssociationsForm"
+<!--       <action name="defineDeTargetAssociationsForm"
             class="org.hisp.dhis.detarget.action.GetNumberOfLevelsAction">
-            <result name="success" type="chain">defineDeTargetAssociationsFormChain</result>
+            <result name="success" type="chain">defineDeTargetAssociationsFormChain</result>-->
             <!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
-        </action>
+<!--        </action>-->
         
-        <action name="defineDeTargetAssociationsFormChain"
+<!--        <action name="defineDeTargetAssociationsFormChain"
+            class="org.hisp.dhis.detarget.action.SetupAssociationsTreeAction">
+            <result name="success" type="velocity">/main.vm</result>
+            <param name="page">/dhis-web-survey/deTargetAssociations.vm</param>
+            <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/associations.js</param>-->
+            <!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
+<!--        </action> -->
+
+		
+        <action name="defineDeTargetAssociationsForm"
             class="org.hisp.dhis.detarget.action.SetupAssociationsTreeAction">
             <result name="success" type="velocity">/main.vm</result>
             <param name="page">/dhis-web-survey/deTargetAssociations.vm</param>
             <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/associations.js</param>
             <!--<param name="requiredAuthorities">F_DATASET_ASSIGN</param>-->
-        </action>
-        
+        </action>		
+		        
         <action name="defineDeTargetAssociations"
             class="org.hisp.dhis.detarget.action.DefineDeTargetAssociationsAction">
             <result name="success" type="redirect">deTargetManagement.action</result>