[Aplaws-commit] r764 - in releases/1.0.2/ccm-ldn-atoz: . pdl/com/arsdigita/london/atoz

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

Author: sskracic
Date: 2005-09-08 12:02:19 +0200 (Thu, 08 Sep 2005)
New Revision: 764

Modified:
   releases/1.0.2/ccm-ldn-atoz/application.xml
   releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl
Log:
  Integrating r763 from trunk (disabled categories
should not be visible in AtoZ).


Modified: releases/1.0.2/ccm-ldn-atoz/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/application.xml	2005-09-08 09:59:38 UTC (rev 763)
+++ releases/1.0.2/ccm-ldn-atoz/application.xml	2005-09-08 10:02:19 UTC (rev 764)
@@ -3,7 +3,7 @@
   name="ccm-ldn-atoz"
   prettyName="A-Z"
   version="1.0.2"
-  release="3">
+  release="4">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.1.1"/>
     <ccm:requires name="ccm-cms" version="6.1.1"/>

Modified: releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl	2005-09-08 09:59:38 UTC (rev 763)
+++ releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl	2005-09-08 10:02:19 UTC (rev 764)
@@ -70,6 +70,7 @@
            cat_root_cat_object_map m
      where c.category_id = a.object_id
        and c.category_id = i.subcategory_id
+       and c.enabled_p = '1'
        and i.category_id = m.category_id
        and m.object_id = :providerID
        and not exists (
@@ -95,6 +96,7 @@
            atoz_cat_alias_map m
      where c.category_id = m.category_id
        and c.category_id = a.object_id
+       and c.enabled_p = '1'
        and m.provider_id = :providerID
   } map {
     id = id;
@@ -125,6 +127,7 @@
            cat_cat_subcat_trans_index i
      where c.category_id = a.object_id
        and c.category_id = i.subcategory_id
+       and c.enabled_p = '1'
        and i.category_id = :rootCategoryID
        and not exists (
            select 1
@@ -149,6 +152,7 @@
            atoz_cat_alias_map m
      where c.category_id = m.category_id
        and c.category_id = a.object_id
+       and c.enabled_p = '1'
        and m.provider_id = :providerID
   } map {
     id = id;
@@ -157,4 +161,4 @@
     description = description;
     sortKey = sort_key;
   }
-}
\ No newline at end of file
+}