From f10243123bf86c3c78815441e89d7d7fb6cbde30 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 29 Nov 2013 09:48:30 +0000
Subject: [PATCH] =?UTF-8?q?-=20BugFix=20f=C3=BCr=20PublicationsConfig=20-?=
 =?UTF-8?q?=20Unsichtbare=20Kategorien=20werden=20jetzt=20nicht=20mehr=20i?=
 =?UTF-8?q?n=20der=20Navigation=20angezeigt,=20wenn=20sie=20ausgew=C3=A4hl?=
 =?UTF-8?q?t=20sind?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@2465 8810af33-2d31-482b-a856-94f89814c4df
---
 .../navigation/ui/category/AbstractTree.java       | 14 ++++++--------
 .../cms/contenttypes/PublicationsConfig.java       |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

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);