LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- BugFix für PublicationsConfig 

- Unsichtbare Kategorien werden jetzt nicht mehr in der Navigation angezeigt, wenn sie ausgewählt sind


git-svn-id: https://svn.libreccm.org/ccm/trunk@2465 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-11-29 09:48:30 +00:00
parent 3aa3e145ed
commit f10243123b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java
View File

@ -123,13 +123,10 @@ public abstract class AbstractTree extends CategoryComponent {
Map children, Map children,
String path, String path,
List idPath) { List idPath) {
if (!cat.isEnabled()) { if (!cat.isEnabled()) {
return null; return null;
} }
s_log.debug("generating node XML for category " + cat.getName()); 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()); s_log.debug(buff.toString());
} }
boolean isSelected = false; boolean isSelected = false;
if (selected.length >= idPath.size()) { if (selected.length >= idPath.size()) {
isSelected = true; isSelected = true;
for (int x = 0; x < idPath.size(); x++) { for (int x = 0; x < idPath.size(); x++) {
@ -158,11 +155,12 @@ public abstract class AbstractTree extends CategoryComponent {
} else { } else {
isSelected = false; isSelected = false;
} }
if (!isSelected && !cat.isVisible()) { //if (!isSelected && !cat.isVisible()) {
if (!cat.isVisible()) {
return null; return null;
} }
// We will concatenate category URLs only if all ancestors have // We will concatenate category URLs only if all ancestors have
// their URLs set correctly. We recognize that is the case if // their URLs set correctly. We recognize that is the case if
// path ends with slash. Otherwise resort to generic (ie. redirect) // path ends with slash. Otherwise resort to generic (ie. redirect)

2
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java
View File

@ -504,7 +504,7 @@ public class PublicationsConfig extends AbstractConfig {
} }
public String getDefaultPublisherFolderPath() { public String getDefaultPublisherFolderPath() {
if (getDefaultPublisherFolderPath() == null) { if (get(defaultPublisherFolderPath) == null) {
return null; return null;
} else { } else {
return (String) get(defaultPublisherFolderPath); return (String) get(defaultPublisherFolderPath);