=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2012-01-28 10:30:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2012-02-01 10:50:31 +0000
@@ -326,6 +326,15 @@
     DataElementGroup getDataElementGroup( int id );
 
     /**
+     * Returns a DataElementGroup.
+     *
+     * @param id the id of the DataElementGroup to return.
+     * @param i18nDataElements whether to i18n the data elements of this group.
+     * @return the DataElementGroup with the given id, or null if no match.
+     */
+    DataElementGroup getDataElementGroup( int id, boolean i18nDataElements );
+
+    /**
      * Returns data elements with identifiers in the given collection.
      *
      * @param identifiers the id collection.
@@ -421,6 +430,8 @@
     void deleteDataElementGroupSet( DataElementGroupSet groupSet );
 
     DataElementGroupSet getDataElementGroupSet( int id );
+    
+    DataElementGroupSet getDataElementGroupSet( int id, boolean i18nGroups );
 
     DataElementGroupSet getDataElementGroupSet( String uid );
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java	2012-02-01 10:50:31 +0000
@@ -118,6 +118,8 @@
     void deleteIndicatorGroup( IndicatorGroup indicatorGroup );
 
     IndicatorGroup getIndicatorGroup( int id );
+    
+    IndicatorGroup getIndicatorGroup( int id, boolean i18nIndicators );
 
     Collection<IndicatorGroup> getIndicatorGroups( Collection<Integer> identifiers );
 
@@ -149,6 +151,8 @@
 
     IndicatorGroupSet getIndicatorGroupSet( int id );
     
+    IndicatorGroupSet getIndicatorGroupSet( int id, boolean i18nGroups );
+    
     IndicatorGroupSet getIndicatorGroupSet( String uid );
 
     IndicatorGroupSet getIndicatorGroupSetByName( String name );

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java	2012-02-01 10:50:31 +0000
@@ -75,9 +75,10 @@
     OrganisationUnitGroup getOrganisationUnitGroup( int id );
 
     /**
+     * Returns the OrganisationUnitGroup with the given identifiers.
      * 
-     * @param identifiers
-     * @return
+     * @param identifiers the collection of identifiers.
+     * @return the OrganisationUnitGroup with the given identifiers.
      */
     Collection<OrganisationUnitGroup> getOrganisationUnitGroups( Collection<Integer> identifiers );
     
@@ -151,6 +152,16 @@
     /**
      * Returns an OrganisationUnitGroupSet.
      * 
+     * @param id the id of the OrganisationUnitGroupSet to return.
+     * @param i18nGroups whether to i18n the groups in this group set.
+     * @return the OrganisationUnitGroupSet with the given id, or null if no
+     *         match.
+     */
+    OrganisationUnitGroupSet getOrganisationUnitGroupSet( int id, boolean i18nGroups );
+
+    /**
+     * Returns an OrganisationUnitGroupSet.
+     * 
      * @param uid the id of the OrganisationUnitGroupSet to return.
      * @return the OrganisationUnitGroupSet with the given uid, or null if no
      *         match.

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java	2012-02-01 10:50:31 +0000
@@ -242,6 +242,15 @@
     ValidationRuleGroup getValidationRuleGroup( int id );
 
     /**
+     * Get ValidationRuleGroup with the given identifier.
+     *
+     * @param id the unique identifier of the ValidationRuleGroup.
+     * @param i18nValidationRules whether to i18n the rules of this group.
+     * @return the ValidationRuleGroup or null if it doesn't exist.
+     */
+    ValidationRuleGroup getValidationRuleGroup( int id, boolean i18nValidationRules );
+
+    /**
      * Get ValidationRuleGroup with the given uid.
      *
      * @param uid the unique identifier of the ValidationRuleGroup.

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2012-02-01 09:54:34 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2012-02-01 10:50:31 +0000
@@ -361,6 +361,18 @@
         return i18n( i18nService, dataElementGroupStore.get( id ) );
     }
     
+    public DataElementGroup getDataElementGroup( int id, boolean i18nDataElements )
+    {
+        DataElementGroup group = getDataElementGroup( id );
+        
+        if ( i18nDataElements )
+        {
+            i18n( i18nService, group.getMembers() );
+        }
+        
+        return group;
+    }
+    
     public Collection<DataElementGroup> getDataElementGroups( final Collection<Integer> identifiers )
     {
         Collection<DataElementGroup> groups = getAllDataElementGroups();
@@ -454,6 +466,18 @@
     {
         return i18n( i18nService, dataElementGroupSetStore.get( id ) );
     }
+    
+    public DataElementGroupSet getDataElementGroupSet( int id, boolean i18nGroups )
+    {
+        DataElementGroupSet groupSet = getDataElementGroupSet( id );
+        
+        if ( i18nGroups )
+        {
+            i18n( i18nService, groupSet.getDataElements() );
+        }
+        
+        return groupSet;
+    }
 
     public DataElementGroupSet getDataElementGroupSet( String uid )
     {

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java	2012-01-30 10:28:30 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java	2012-02-01 10:50:31 +0000
@@ -289,6 +289,18 @@
         return i18n( i18nService, indicatorGroupStore.get( id ) );
     }
 
+    public IndicatorGroup getIndicatorGroup( int id, boolean i18nIndicators )
+    {
+        IndicatorGroup group = getIndicatorGroup( id );
+        
+        if ( i18nIndicators )
+        {
+            i18n( i18nService, group.getMembers() );
+        }
+        
+        return group;
+    }
+
     public Collection<IndicatorGroup> getIndicatorGroups( final Collection<Integer> identifiers )
     {
         Collection<IndicatorGroup> groups = getAllIndicatorGroups();
@@ -379,6 +391,18 @@
     {
         return i18n( i18nService, indicatorGroupSetStore.get( id ) );
     }
+    
+    public IndicatorGroupSet getIndicatorGroupSet( int id, boolean i18nGroups )
+    {
+        IndicatorGroupSet groupSet = getIndicatorGroupSet( id );
+        
+        if ( i18nGroups )
+        {
+            i18n( i18nService, groupSet.getMembers() );
+        }
+        
+        return groupSet;
+    }
 
     public IndicatorGroupSet getIndicatorGroupSet( String uid )
     {

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java	2012-01-28 16:24:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java	2012-02-01 10:50:31 +0000
@@ -172,6 +172,18 @@
         return i18n( i18nService, organisationUnitGroupSetStore.get( id ) );
     }
 
+    public OrganisationUnitGroupSet getOrganisationUnitGroupSet( int id, boolean i18nGroups )
+    {
+        OrganisationUnitGroupSet groupSet = getOrganisationUnitGroupSet( id );
+        
+        if ( i18nGroups )
+        {
+            i18n( i18nService, groupSet.getOrganisationUnitGroups() );
+        }
+        
+        return groupSet;
+    }
+
     public OrganisationUnitGroupSet getOrganisationUnitGroupSet( String uid )
     {
         return i18n( i18nService, organisationUnitGroupSetStore.getByUid( uid ) );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java	2012-01-30 10:28:30 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java	2012-02-01 10:50:31 +0000
@@ -359,8 +359,6 @@
     {
         final Set<ValidationRule> relevantValidationRules = new HashSet<ValidationRule>();
 
-        // TODO move getDataElementsInExpression out of for-loop
-
         for ( ValidationRule validationRule : getAllValidationRules() )
         {
             for ( DataElement dataElement : dataElements )
@@ -486,11 +484,23 @@
         return i18n( i18nService, validationRuleGroupStore.get( id ) );
     }
 
+    public ValidationRuleGroup getValidationRuleGroup( int id, boolean i18nValidationRules )
+    {
+        ValidationRuleGroup group = getValidationRuleGroup( id );
+        
+        if ( i18nValidationRules )
+        {
+            i18n( i18nService, group.getMembers() );
+        }
+        
+        return group;
+    }
+
     public ValidationRuleGroup getValidationRuleGroup( String uid )
     {
         return i18n( i18nService, validationRuleGroupStore.getByUid( uid ) );
     }
-
+    
     public Collection<ValidationRuleGroup> getAllValidationRuleGroups()
     {
         return i18n( i18nService, validationRuleGroupStore.getAll() );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.java	2012-01-20 10:38:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.java	2012-02-01 10:50:31 +0000
@@ -96,7 +96,7 @@
         // Get group members
         // ---------------------------------------------------------------------
 
-        dataElementGroup = dataElementService.getDataElementGroup( id );
+        dataElementGroup = dataElementService.getDataElementGroup( id, true );
 
         groupMembers = new ArrayList<DataElement>( dataElementGroup.getMembers() );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java	2012-01-25 17:11:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java	2012-02-01 10:50:31 +0000
@@ -82,7 +82,7 @@
     public String execute()
         throws Exception
     {
-        dataElementGroupSet = dataElementService.getDataElementGroupSet( id );       
+        dataElementGroupSet = dataElementService.getDataElementGroupSet( id, true );       
         
         selectedGroups = dataElementGroupSet.getMembers();
         

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java	2012-01-20 10:38:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java	2012-02-01 10:50:31 +0000
@@ -88,7 +88,7 @@
 
     public String execute()
     {
-        indicatorGroup = indicatorService.getIndicatorGroup( id );
+        indicatorGroup = indicatorService.getIndicatorGroup( id, true );
 
         groupMembers = new ArrayList<Indicator>( indicatorGroup.getMembers() );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java	2012-01-25 17:11:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java	2012-02-01 10:50:31 +0000
@@ -85,7 +85,7 @@
 
     public String execute()
     {
-        indicatorGroupSet = indicatorService.getIndicatorGroupSet( id );
+        indicatorGroupSet = indicatorService.getIndicatorGroupSet( id, true );
 
         selectedGroups = indicatorGroupSet.getMembers();
         

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm	2011-10-06 07:29:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm	2012-02-01 10:50:31 +0000
@@ -64,7 +64,7 @@
 		<td>
 			<select id="groupMembers" name="groupMembers" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
 				#foreach( $dataElement in $groupMembers )
-					<option value="$dataElement.id">$encoder.htmlEncode( $dataElement.name )</option>
+					<option value="$dataElement.id">$encoder.htmlEncode( $dataElement.displayName )</option>
 				#end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm	2011-10-05 10:06:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm	2012-02-01 10:50:31 +0000
@@ -19,7 +19,7 @@
 	});
 </script>
 
-<h3>$i18n.getString( "update_dataelementgroupset" ) : $dataElementGroupSet.name</h3>
+<h3>$i18n.getString( "update_dataelementgroupset" )</h3>
 
 <form id="updateDataElementGroupSet" action="updateDataElementGroupSet.action" method="post">
 
@@ -82,7 +82,7 @@
 		<td>
 			<select id="groupMembers" name="groupMembers" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
 				#foreach( $dataElementGroup in $selectedGroups )
-                    <option value="$dataElementGroup.id">$encoder.htmlEncode( $dataElementGroup.name )</option>
+                    <option value="$dataElementGroup.id">$encoder.htmlEncode( $dataElementGroup.displayName )</option>
                 #end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm	2011-10-06 07:29:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm	2012-02-01 10:50:31 +0000
@@ -65,7 +65,7 @@
 		<td>
 			<select id="groupMembers" name="groupMembers" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
 				#foreach( $indicator in $groupMembers )
-                    <option value="$indicator.id">$encoder.htmlEncode( $indicator.name )</option>
+                    <option value="$indicator.id">$encoder.htmlEncode( $indicator.displayName )</option>
                 #end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm	2011-10-05 10:06:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm	2012-02-01 10:50:31 +0000
@@ -21,7 +21,7 @@
 	});
 </script>
 
-<h3>$i18n.getString( "update_indicatorgroupset" ) : $indicatorGroupSet.name</h3>
+<h3>$i18n.getString( "update_indicatorgroupset" )</h3>
 
 <form id="updateIndicatorGroupSet" action="updateIndicatorGroupSet.action" method="post">
 <input type=hidden id="id" name="id" value="$indicatorGroupSet.id"/>
@@ -82,7 +82,7 @@
 		<td>
 			<select id="groupMembers" name="groupMembers" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
 				#foreach( $indicatorGroup in $selectedGroups )
-                    <option value="$indicatorGroup.id">$encoder.htmlEncode( $indicatorGroup.name )</option>
+                    <option value="$indicatorGroup.id">$encoder.htmlEncode( $indicatorGroup.displayName )</option>
                 #end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java	2012-02-01 10:50:31 +0000
@@ -91,7 +91,7 @@
     public String execute()
         throws Exception
     {
-        organisationUnitGroup = organisationUnitGroupService.getOrganisationUnitGroup( id.intValue() );
+        organisationUnitGroup = organisationUnitGroupService.getOrganisationUnitGroup( id );
 
         memberCount = organisationUnitGroup.getMembers().size();
         

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/RemoveOrganisationUnitGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/RemoveOrganisationUnitGroupAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/RemoveOrganisationUnitGroupAction.java	2012-02-01 10:50:31 +0000
@@ -68,7 +68,7 @@
         throws Exception
     {
         organisationUnitGroupService.deleteOrganisationUnitGroup( organisationUnitGroupService
-            .getOrganisationUnitGroup( id.intValue() ) );
+            .getOrganisationUnitGroup( id ) );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetAction.java	2012-02-01 10:50:31 +0000
@@ -82,7 +82,7 @@
     public String execute()
         throws Exception
     {
-        organisationUnitGroupSet = organisationUnitGroupService.getOrganisationUnitGroupSet( id.intValue() );
+        organisationUnitGroupSet = organisationUnitGroupService.getOrganisationUnitGroupSet( id );
 
         if ( organisationUnitGroupSet != null )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareUpdateGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareUpdateGroupSetAction.java	2012-01-25 17:11:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/PrepareUpdateGroupSetAction.java	2012-02-01 10:50:31 +0000
@@ -87,7 +87,7 @@
     public String execute()
         throws Exception
     {
-        organisationUnitGroupSet = organisationUnitGroupService.getOrganisationUnitGroupSet( id.intValue() );
+        organisationUnitGroupSet = organisationUnitGroupService.getOrganisationUnitGroupSet( id, true );
 
         selectedGroups = new ArrayList<OrganisationUnitGroup>( organisationUnitGroupSet.getOrganisationUnitGroups() );
 
@@ -95,5 +95,4 @@
 
         return SUCCESS;
     }
-
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/RemoveGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/RemoveGroupSetAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/RemoveGroupSetAction.java	2012-02-01 10:50:31 +0000
@@ -68,7 +68,7 @@
         throws Exception
     {
         organisationUnitGroupService.deleteOrganisationUnitGroupSet( organisationUnitGroupService
-            .getOrganisationUnitGroupSet( id.intValue() ) );
+            .getOrganisationUnitGroupSet( id ) );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java	2012-02-01 10:50:31 +0000
@@ -101,7 +101,7 @@
     public String execute()
         throws Exception
     {
-        OrganisationUnitGroupSet groupSet = organisationUnitGroupService.getOrganisationUnitGroupSet( id.intValue() );
+        OrganisationUnitGroupSet groupSet = organisationUnitGroupService.getOrganisationUnitGroupSet( id );
 
         groupSet.setName( name );
         groupSet.setDescription( description );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm	2011-11-22 12:19:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm	2012-02-01 10:50:31 +0000
@@ -89,7 +89,7 @@
 		<td>
 			<select id="selectedGroups" name="selectedGroups" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px;">
 				#foreach ( $group in $selectedGroups )
-    				<option value="$group.id">$group.name</option>
+    				<option value="$group.id">$group.displayName</option>
     			#end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/ShowUpdateValidationRuleGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/ShowUpdateValidationRuleGroupFormAction.java	2012-01-25 17:11:43 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/ShowUpdateValidationRuleGroupFormAction.java	2012-02-01 10:50:31 +0000
@@ -104,7 +104,7 @@
         // Get selected group
         // ---------------------------------------------------------------------
 
-        validationRuleGroup = validationRuleService.getValidationRuleGroup( id );
+        validationRuleGroup = validationRuleService.getValidationRuleGroup( id, true );
 
         groupMembers = new ArrayList<ValidationRule>( validationRuleGroup.getMembers() );
 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm	2011-07-07 05:56:09 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm	2012-02-01 10:50:31 +0000
@@ -66,7 +66,7 @@
         <td>
             <select id="groupMembers" name="groupMembers" multiple="multiple" style="height: 200px; width: 100%; margin-top: 22px">
 			#foreach( $validationRule in $groupMembers )
-				<option value="$validationRule.id">$encoder.htmlEncode( $validationRule.name )</option>
+				<option value="$validationRule.id">$encoder.htmlEncode( $validationRule.displayName )</option>
 			#end
             </select>
         </td>