[Aplaws-commit] r170 - ccm-cms/trunk/src/com/arsdigita/cms/ui/permissions ccm-core/trunk/src/com/arsdigita/ui/admin

[<ssk...@re...>]

Author: sskracic
Date: 2005-01-05 17:32:08 +0100 (Wed, 05 Jan 2005)
New Revision: 170

Modified:
   ccm-cms/trunk/src/com/arsdigita/cms/ui/permissions/CMSPermissionsGrant.java
   ccm-core/trunk/src/com/arsdigita/ui/admin/GroupAdministrationTab.java
   ccm-core/trunk/src/com/arsdigita/ui/admin/GroupTreeModel.java
Log:
  Consistent group/subgroup ordering in UI, sorting by name.


Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/permissions/CMSPermissionsGrant.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/permissions/CMSPermissionsGrant.java	2005-01-05 16:04:29 UTC (rev 169)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/permissions/CMSPermissionsGrant.java	2005-01-05 16:32:08 UTC (rev 170)
@@ -189,7 +189,7 @@
 
             PartyCollection parties = Party.retrieveAllParties();
             parties.filter(search);
-            parties.addOrder(Party.DISPLAY_NAME);
+            parties.addOrder("lower(" + Party.DISPLAY_NAME + ") asc");
 
             String userID, userName;
             while(parties.next()) {

Modified: ccm-core/trunk/src/com/arsdigita/ui/admin/GroupAdministrationTab.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/ui/admin/GroupAdministrationTab.java	2005-01-05 16:04:29 UTC (rev 169)
+++ ccm-core/trunk/src/com/arsdigita/ui/admin/GroupAdministrationTab.java	2005-01-05 16:32:08 UTC (rev 170)
@@ -478,6 +478,7 @@
 
     public SubGroupListModel(GroupCollection coll) {
         m_coll = coll;
+        m_coll.addOrder("lower(" + Group.DISPLAY_NAME + ") asc");
     }
 
     public Object getElement() {

Modified: ccm-core/trunk/src/com/arsdigita/ui/admin/GroupTreeModel.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/ui/admin/GroupTreeModel.java	2005-01-05 16:04:29 UTC (rev 169)
+++ ccm-core/trunk/src/com/arsdigita/ui/admin/GroupTreeModel.java	2005-01-05 16:32:08 UTC (rev 170)
@@ -126,6 +126,7 @@
             }
 
             GroupCollection coll = group.getSubgroups();
+            coll.addOrder("lower("+ Group.DISPLAY_NAME + ") asc");
 
             return new GroupIterator(coll);