[Aplaws-commit] r1274 - trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms

[<ssk...@vh...>]

Author: sskracic
Date: 2006-07-25 15:18:02 +0200 (Tue, 25 Jul 2006)
New Revision: 1274

Modified:
   trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java
Log:
   Integrated SF patch [ 1339671 ] Correct category selection.


Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java	2006-07-25 09:27:50 UTC (rev 1273)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java	2006-07-25 13:18:02 UTC (rev 1274)
@@ -109,7 +109,7 @@
             DataAssociation assoc = (DataAssociation)DomainServiceInterfaceExposer
                 .get(bundle, "categories");
             DataAssociationCursor categories = assoc.cursor();
-            categories.addOrder("link.isDefault desc");
+            categories.addOrder("assoc.isEnabled desc, link.isDefault desc");
             Filter f = categories.addInSubqueryFilter(
                 "id",
                 "com.arsdigita.categorization.categoryIDsInSubtree"