diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java index 9de4cf13f..4d8f65411 100755 --- a/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java +++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java @@ -123,13 +123,10 @@ public abstract class AbstractTree extends CategoryComponent { Map children, String path, List idPath) { - - - if (!cat.isEnabled()) { return null; } - + s_log.debug("generating node XML for category " + cat.getName()); @@ -147,7 +144,7 @@ public abstract class AbstractTree extends CategoryComponent { s_log.debug(buff.toString()); } - boolean isSelected = false; + boolean isSelected = false; if (selected.length >= idPath.size()) { isSelected = true; for (int x = 0; x < idPath.size(); x++) { @@ -158,11 +155,12 @@ public abstract class AbstractTree extends CategoryComponent { } else { isSelected = false; } - - if (!isSelected && !cat.isVisible()) { + + //if (!isSelected && !cat.isVisible()) { + if (!cat.isVisible()) { return null; } - + // We will concatenate category URLs only if all ancestors have // their URLs set correctly. We recognize that is the case if // path ends with slash. Otherwise resort to generic (ie. redirect) diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java index 9fa7660b7..c43ca1876 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java @@ -504,7 +504,7 @@ public class PublicationsConfig extends AbstractConfig { } public String getDefaultPublisherFolderPath() { - if (getDefaultPublisherFolderPath() == null) { + if (get(defaultPublisherFolderPath) == null) { return null; } else { return (String) get(defaultPublisherFolderPath);