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

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

Author: sskracic
Date: 2005-09-12 11:25:57 +0200 (Mon, 12 Sep 2005)
New Revision: 766

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:
  Integrated r765 from trunk (disabled category should have
all its children removed from AtoZ category listing).


Modified: releases/1.0.2/ccm-ldn-atoz/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/application.xml	2005-09-12 09:24:15 UTC (rev 765)
+++ releases/1.0.2/ccm-ldn-atoz/application.xml	2005-09-12 09:25:57 UTC (rev 766)
@@ -3,7 +3,7 @@
   name="ccm-ldn-atoz"
   prettyName="A-Z"
   version="1.0.2"
-  release="4">
+  release="5">
   <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-12 09:24:15 UTC (rev 765)
+++ releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl	2005-09-12 09:25:57 UTC (rev 766)
@@ -70,11 +70,20 @@
            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 (
            select 1
+             from cat_cat_subcat_trans_index i2
+             where i2.category_id in (
+                 select c2.category_id
+                    from cat_categories c2
+                    where c2.enabled_p = '0'
+               )
+               and i2.subcategory_id = c.category_id
+       )
+       and not exists (
+           select 1
              from atoz_cat_blacklist_map b
             where b.category_id = c.category_id
               and b.provider_id = :providerID
@@ -127,7 +136,6 @@
            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
@@ -137,6 +145,16 @@
        )
        and not exists (
            select 1
+             from cat_cat_subcat_trans_index i2
+             where i2.category_id in (
+                 select c2.category_id
+                    from cat_categories c2
+                    where c2.enabled_p = '0'
+               )
+               and i2.subcategory_id = c.category_id
+       )
+       and not exists (
+           select 1
              from atoz_cat_alias_map b
             where b.category_id = c.category_id
               and b.provider_id = :providerID