Scarab commit: svn commit: r10150 - trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java

Author: dabbous
Date: 2006-06-07 01:33:11-0700
New Revision: 10150

Modified:
   trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java

Log:
list of common attributes now sorted in alphabetical order.

replace setDistinct() by "order by Attribute_ID"

Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&rev=10150&p1=trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java&p2=trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java&r1=10149&r2=10150
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2006-06-07 01:33:11-0700
@@ -1134,11 +1134,12 @@
         crit.add(RModuleAttributePeer.MODULE_ID, getModuleId());
         crit.add(AttributePeer.DELETED, false);
         crit.add(RModuleAttributePeer.ACTIVE, true);
-        //crit.addAscendingOrderByColumn(
-        //       RModuleAttributePeer.DISPLAY_VALUE);
         crit.addAscendingOrderByColumn(
-                RModuleAttributePeer.PREFERRED_ORDER);
-        crit.setDistinct(); // need this here, because otherwise duplicate attributes are returned
+               RModuleAttributePeer.DISPLAY_VALUE);
+        //crit.addAscendingOrderByColumn(
+        //        RModuleAttributePeer.PREFERRED_ORDER);
+        crit.addGroupByColumn(AttributePeer.ATTRIBUTE_ID);
+        //crit.setDistinct(); // need this here, because otherwise duplicate attributes are returned
                             // FIXME: Mazbe it is possible to create a query without the distinct,
                             // but i don't seem to get it managed... [HD]
         List result = AttributePeer.doSelect(crit);