dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27667
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13775: attribute for orgUnitGroupSets, done
------------------------------------------------------------
revno: 13775
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-01-19 13:27:35 +0700
message:
attribute for orgUnitGroupSets, done
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeSortOrderComparator.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupFormAction.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/EditUserGroupFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowAddDataElementGroupForm.java
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/indicator/ShowAddIndicatorForm.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowAddIndicatorGroupForm.java
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/indicatortype/GetIndicatorTypeListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/EditDataSetFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ShowAddOrganisationUnitFormAction.java
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/ShowAddOrganisationUnitGroupFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ShowUpdateGroupSetFormAction.java
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/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml
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/addOrganisationUnitGroupSetForm.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-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.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-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeSortOrderComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeSortOrderComparator.java 2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeSortOrderComparator.java 2014-01-19 06:27:35 +0000
@@ -28,16 +28,18 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.attribute.Attribute;
+
import java.util.Comparator;
-import org.hisp.dhis.attribute.Attribute;
-
/**
* @author mortenoh
*/
public class AttributeSortOrderComparator
implements Comparator<Attribute>
{
+ public static final Comparator<Attribute> INSTANCE = new AttributeSortOrderComparator();
+
@Override
public int compare( Attribute attribute0, Attribute attribute1 )
{
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/AddUserGroupFormAction.java 2014-01-19 06:27:35 +0000
@@ -31,6 +31,7 @@
import com.opensymphony.xwork2.Action;
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.attribute.AttributeService;
+import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import java.util.ArrayList;
@@ -70,7 +71,7 @@
throws Exception
{
attributes = new ArrayList<Attribute>( attributeService.getUserGroupAttributes() );
- Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/EditUserGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/EditUserGroupFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/usergroup/action/EditUserGroupFormAction.java 2014-01-19 06:27:35 +0000
@@ -31,6 +31,7 @@
import com.opensymphony.xwork2.Action;
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.attribute.AttributeService;
+import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.system.util.AttributeUtils;
import org.hisp.dhis.user.User;
@@ -122,7 +123,7 @@
attributeValues = AttributeUtils.getAttributeValueMap( group.getAttributeValues() );
- Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java 2013-12-23 16:25:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java 2014-01-19 06:27:35 +0000
@@ -249,7 +249,7 @@
Collections.sort( dataElementCategoryCombos, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
Collections.sort( optionSets, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( legendSets, IdentifiableObjectNameComparator.INSTANCE );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowAddDataElementGroupForm.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowAddDataElementGroupForm.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowAddDataElementGroupForm.java 2014-01-19 06:27:35 +0000
@@ -69,7 +69,7 @@
public String execute()
{
attributes = new ArrayList<Attribute>( attributeService.getDataElementGroupAttributes() );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== 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 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.java 2014-01-19 06:27:35 +0000
@@ -126,8 +126,8 @@
attributeValues = AttributeUtils.getAttributeValueMap( dataElementGroup.getAttributeValues() );
- Collections.sort( groupMembers, new IdentifiableObjectNameComparator() );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( groupMembers, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowAddIndicatorForm.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowAddIndicatorForm.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowAddIndicatorForm.java 2014-01-19 06:27:35 +0000
@@ -111,7 +111,7 @@
legendSets = new ArrayList<MapLegendSet>( mappingService.getAllMapLegendSets() );
Collections.sort( indicatorTypes, IdentifiableObjectNameComparator.INSTANCE );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
Collections.sort( legendSets, IdentifiableObjectNameComparator.INSTANCE );
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java 2014-01-19 06:27:35 +0000
@@ -175,7 +175,7 @@
Collections.sort( indicatorTypes, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
Collections.sort( legendSets, IdentifiableObjectNameComparator.INSTANCE );
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowAddIndicatorGroupForm.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowAddIndicatorGroupForm.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowAddIndicatorGroupForm.java 2014-01-19 06:27:35 +0000
@@ -72,7 +72,7 @@
public String execute()
{
attributes = new ArrayList<Attribute>( attributeService.getIndicatorAttributes() );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== 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 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java 2014-01-19 06:27:35 +0000
@@ -118,8 +118,8 @@
attributeValues = AttributeUtils.getAttributeValueMap( indicatorGroup.getAttributeValues() );
- Collections.sort( groupMembers, new IdentifiableObjectNameComparator() );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( groupMembers, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java 2014-01-19 06:27:35 +0000
@@ -130,7 +130,7 @@
attributes = new ArrayList<Attribute>( attributeService.getIndicatorAttributes() );
Collections.sort( indicatorTypes, IdentifiableObjectNameComparator.INSTANCE );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml 2014-01-09 21:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml 2014-01-19 06:27:35 +0000
@@ -2,30 +2,29 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<artifactId>dhis-web-maintenance</artifactId>
<groupId>org.hisp.dhis</groupId>
<version>2.15-SNAPSHOT</version>
</parent>
-
+
<artifactId>dhis-web-maintenance-dataset</artifactId>
<packaging>war</packaging>
<name>DHIS Data Set Management</name>
-
+
<build>
<finalName>dhis-web-maintenance-dataset</finalName>
</build>
-
+
<dependencies>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- </dependency>
-
+ </dependency>
+
<!-- DHIS -->
-
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-api</artifactId>
@@ -49,10 +48,10 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
-
+
</dependencies>
- <properties>
- <rootDir>../../../</rootDir>
- </properties>
+ <properties>
+ <rootDir>../../../</rootDir>
+ </properties>
</project>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/EditDataSetFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/EditDataSetFormAction.java 2014-01-19 05:53:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/EditDataSetFormAction.java 2014-01-19 06:27:35 +0000
@@ -36,6 +36,7 @@
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.attribute.AttributeService;
+import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -206,6 +207,7 @@
Collections.sort( dataElements, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( indicators, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( legendSets, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java 2014-01-19 06:27:35 +0000
@@ -38,6 +38,7 @@
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.attribute.AttributeService;
+import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
@@ -195,7 +196,7 @@
Collections.sort( availableDataSets, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( dataSets, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
- Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
// ---------------------------------------------------------------------
// Allow update only if org unit does not have polygon coordinates
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ShowAddOrganisationUnitFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ShowAddOrganisationUnitFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ShowAddOrganisationUnitFormAction.java 2014-01-19 06:27:35 +0000
@@ -31,6 +31,7 @@
import com.opensymphony.xwork2.Action;
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.attribute.AttributeService;
+import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
@@ -123,7 +124,7 @@
Collections.sort( dataSets, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
- Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== 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 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java 2014-01-19 06:27:35 +0000
@@ -31,6 +31,7 @@
import com.opensymphony.xwork2.Action;
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.attribute.AttributeService;
+import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
@@ -128,7 +129,7 @@
attributeValues = AttributeUtils.getAttributeValueMap( organisationUnitGroup.getAttributeValues() );
- Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/ShowAddOrganisationUnitGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/ShowAddOrganisationUnitGroupFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/ShowAddOrganisationUnitGroupFormAction.java 2014-01-19 06:27:35 +0000
@@ -69,7 +69,7 @@
public String execute()
{
attributes = new ArrayList<Attribute>( attributeService.getOrganisationUnitGroupAttributes() );
- Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java 2013-12-30 09:44:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java 2014-01-19 06:27:35 +0000
@@ -30,13 +30,16 @@
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
+import org.hisp.dhis.attribute.AttributeService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
import com.opensymphony.xwork2.Action;
+import org.hisp.dhis.system.util.AttributeUtils;
/**
* @author Lars Helge Overland
@@ -56,6 +59,13 @@
this.organisationUnitGroupService = organisationUnitGroupService;
}
+ private AttributeService attributeService;
+
+ public void setAttributeService( AttributeService attributeService )
+ {
+ this.attributeService = attributeService;
+ }
+
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -95,6 +105,13 @@
this.selectedGroups = selectedGroups;
}
+ private List<String> jsonAttributeValues;
+
+ public void setJsonAttributeValues( List<String> jsonAttributeValues )
+ {
+ this.jsonAttributeValues = jsonAttributeValues;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -114,6 +131,12 @@
}
}
+ if ( jsonAttributeValues != null )
+ {
+ AttributeUtils.updateAttributeValuesFromJson( groupSet.getAttributeValues(),
+ jsonAttributeValues, attributeService );
+ }
+
groupSet.setOrganisationUnitGroups( selectedMembers );
organisationUnitGroupService.addOrganisationUnitGroupSet( groupSet );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ShowUpdateGroupSetFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ShowUpdateGroupSetFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ShowUpdateGroupSetFormAction.java 2014-01-19 06:27:35 +0000
@@ -30,14 +30,20 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.hisp.dhis.attribute.Attribute;
+import org.hisp.dhis.attribute.AttributeService;
+import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
import com.opensymphony.xwork2.Action;
+import org.hisp.dhis.system.util.AttributeUtils;
/**
* @author Lars Helge Overland
@@ -56,6 +62,13 @@
this.organisationUnitGroupService = organisationUnitGroupService;
}
+ private AttributeService attributeService;
+
+ public void setAttributeService( AttributeService attributeService )
+ {
+ this.attributeService = attributeService;
+ }
+
// -------------------------------------------------------------------------
// Input/output
// -------------------------------------------------------------------------
@@ -81,6 +94,20 @@
return selectedGroups;
}
+ private List<Attribute> attributes;
+
+ public List<Attribute> getAttributes()
+ {
+ return attributes;
+ }
+
+ public Map<Integer, String> attributeValues = new HashMap<Integer, String>();
+
+ public Map<Integer, String> getAttributeValues()
+ {
+ return attributeValues;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -94,6 +121,12 @@
Collections.sort( selectedGroups, IdentifiableObjectNameComparator.INSTANCE );
+ attributes = new ArrayList<Attribute>( attributeService.getOrganisationUnitGroupSetAttributes() );
+
+ attributeValues = AttributeUtils.getAttributeValueMap( organisationUnitGroupSet.getAttributeValues() );
+
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
+
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 2013-12-30 09:44:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java 2014-01-19 06:27:35 +0000
@@ -30,17 +30,19 @@
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
+import org.hisp.dhis.attribute.AttributeService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
import com.opensymphony.xwork2.Action;
+import org.hisp.dhis.system.util.AttributeUtils;
/**
* @author Lars Helge Overland
- * @version $Id$
*/
public class UpdateGroupSetAction
implements Action
@@ -56,6 +58,13 @@
this.organisationUnitGroupService = organisationUnitGroupService;
}
+ private AttributeService attributeService;
+
+ public void setAttributeService( AttributeService attributeService )
+ {
+ this.attributeService = attributeService;
+ }
+
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -102,6 +111,13 @@
this.selectedGroups = selectedGroups;
}
+ private List<String> jsonAttributeValues;
+
+ public void setJsonAttributeValues( List<String> jsonAttributeValues )
+ {
+ this.jsonAttributeValues = jsonAttributeValues;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -128,6 +144,12 @@
organisationUnitGroupSet.setOrganisationUnitGroups( selectedMembers );
+ if ( jsonAttributeValues != null )
+ {
+ AttributeUtils.updateAttributeValuesFromJson( organisationUnitGroupSet.getAttributeValues(),
+ jsonAttributeValues, attributeService );
+ }
+
organisationUnitGroupService.updateOrganisationUnitGroupSet( organisationUnitGroupSet );
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/META-INF/dhis/beans.xml 2013-10-13 16:15:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/META-INF/dhis/beans.xml 2014-01-19 06:27:35 +0000
@@ -118,6 +118,10 @@
<!-- OrganisationUnitGroupSet -->
+ <bean id="org.hisp.dhis.oum.action.organisationunitgroupset.ShowAddOrganisationUnitGroupSetFormAction" class="org.hisp.dhis.oum.action.organisationunitgroupset.ShowAddOrganisationUnitGroupSetFormAction">
+ <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
+ </bean>
+
<bean id="org.hisp.dhis.oum.action.organisationunitgroupset.GetGroupSetListAction" class="org.hisp.dhis.oum.action.organisationunitgroupset.GetGroupSetListAction"
scope="prototype">
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
@@ -131,6 +135,7 @@
<bean id="org.hisp.dhis.oum.action.organisationunitgroupset.AddGroupSetAction" class="org.hisp.dhis.oum.action.organisationunitgroupset.AddGroupSetAction"
scope="prototype">
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+ <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
</bean>
<bean id="org.hisp.dhis.oum.action.organisationunitgroupset.GetGroupSetAction" class="org.hisp.dhis.oum.action.organisationunitgroupset.GetGroupSetAction"
@@ -146,11 +151,13 @@
<bean id="org.hisp.dhis.oum.action.organisationunitgroupset.UpdateGroupSetAction" class="org.hisp.dhis.oum.action.organisationunitgroupset.UpdateGroupSetAction"
scope="prototype">
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+ <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
</bean>
<bean id="org.hisp.dhis.oum.action.organisationunitgroupset.ShowUpdateGroupSetFormAction" class="org.hisp.dhis.oum.action.organisationunitgroupset.ShowUpdateGroupSetFormAction"
scope="prototype">
<property name="organisationUnitGroupService" ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService" />
+ <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
</bean>
<!-- Hierarchy operations -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2013-10-13 16:15:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml 2014-01-19 06:27:35 +0000
@@ -152,7 +152,7 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <action name="showAddOrganisationUnitGroupSetForm" class="org.hisp.dhis.oum.action.NoAction">
+ <action name="showAddOrganisationUnitGroupSetForm" class="org.hisp.dhis.oum.action.organisationunitgroupset.ShowAddOrganisationUnitGroupSetFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm</param>
<param name="javascripts">javascript/organisationUnitGroupSet.js</param>
=== 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 2013-10-10 15:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm 2014-01-19 06:27:35 +0000
@@ -8,7 +8,6 @@
'beforeValidateHandler' : function()
{
jQuery( "#selectedDataSetsList" ).find( "option" ).attr( "selected", "selected" );
-
#tblDynamicAttributesJavascript()
},
'rules' : getValidationRules( "organisationUnitGroup" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm 2013-12-30 09:44:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm 2014-01-19 06:27:35 +0000
@@ -1,6 +1,19 @@
-<script type="text/javascript" src="javascript/addOrganisationUnitGroupSetForm.js"></script>
<script type="text/javascript">
jQuery(function() {
+ validation2('addOrganisationUnitGroupSetForm', function(form) {
+ form.submit();
+ }, {
+ 'beforeValidateHandler' : function() {
+ selectAllById('selectedGroups');
+ #tblDynamicAttributesJavascript()
+ },
+ 'rules' : getValidationRules("organisationUnitGroupSet")
+ });
+
+ checkValueIsExist("name", "validateOrganisationUnitGroupSet.action");
+
+ changeCompulsory(getFieldValue('compulsory'));
+
jQuery("#availableGroups").dhisAjaxSelect({
source: "../dhis-web-commons-ajax-json/getOrganisationUnitGroups.action",
iterator: "organisationUnitGroups",
@@ -63,6 +76,8 @@
</tr>
</table>
+#tblDynamicAttributes( { "attributes": $attributes, "attributeValues": $attributeValues } )
+
<table>
<colgroup>
<col style="width: 500px;"/>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js 2011-05-26 14:44:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-jQuery(document).ready(function() {
- validation2('addOrganisationUnitGroupSetForm', function(form) {
- form.submit();
- }, {
- 'beforeValidateHandler' : function() {
- selectAllById('selectedGroups');
- },
- 'rules' : getValidationRules("organisationUnitGroupSet")
- });
-
- checkValueIsExist("name", "validateOrganisationUnitGroupSet.action");
-
- changeCompulsory(getFieldValue('compulsory'));
-});
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js 2011-05-26 14:44:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-jQuery(document).ready(function() {
- validation2('updateOrganisationUnitGroupSetForm', function(form) {
- form.submit();
- }, {
- 'beforeValidateHandler' : function() {
- selectAllById('selectedGroups');
- },
- 'rules' : getValidationRules("organisationUnitGroupSet")
- });
-
- changeCompulsory(getFieldValue('compulsory'));
-});
=== 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 2013-11-20 14:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm 2014-01-19 06:27:35 +0000
@@ -7,7 +7,6 @@
'beforeValidateHandler' : function()
{
jQuery( "#selectedDataSetsList" ).find( "option" ).attr( "selected", "selected" );
-
#tblDynamicAttributesJavascript()
},
'rules' : getValidationRules( "organisationUnitGroup" )
=== 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 2013-12-30 09:44:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm 2014-01-19 06:27:35 +0000
@@ -1,6 +1,17 @@
-<script type="text/javascript" src="javascript/updateOrganisationUnitGroupSetForm.js"></script>
<script type="text/javascript">
jQuery(function() {
+ validation2('updateOrganisationUnitGroupSetForm', function(form) {
+ form.submit();
+ }, {
+ 'beforeValidateHandler' : function() {
+ selectAllById('selectedGroups');
+ #tblDynamicAttributesJavascript()
+ },
+ 'rules' : getValidationRules("organisationUnitGroupSet")
+ });
+
+ changeCompulsory(getFieldValue('compulsory'));
+
jQuery("#availableGroups").dhisAjaxSelect({
source: "../dhis-web-commons-ajax-json/getOrganisationUnitGroups.action",
iterator: "organisationUnitGroups",
@@ -71,6 +82,8 @@
</tr>
</table>
+#tblDynamicAttributes( { "attributes": $attributes, "attributeValues": $attributeValues } )
+
<table>
<colgroup>
<col style="width: 500px;"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java 2013-10-08 17:16:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java 2014-01-19 06:27:35 +0000
@@ -41,6 +41,7 @@
import org.hisp.dhis.attribute.Attribute;
import org.hisp.dhis.attribute.AttributeService;
+import org.hisp.dhis.attribute.comparator.AttributeSortOrderComparator;
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.i18n.I18nService;
import org.hisp.dhis.i18n.locale.LocaleManager;
@@ -237,8 +238,7 @@
}
attributes = new ArrayList<Attribute>( attributeService.getUserAttributes() );
-
- Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );
return SUCCESS;
}
