From 98110662e740e16a6d4daa6546141d0965433a87 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 15 Nov 2013 08:02:28 +0000 Subject: [PATCH] =?UTF-8?q?Bugfix=20f=C3=BCr=20den=20Kategorienfilter=20(S?= =?UTF-8?q?eparator=20f=C3=BCr=20mehrere=20Kategorien=20wurde=20nicht=20?= =?UTF-8?q?=C3=BCberall=20beachtet)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@2437 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/ui/ItemSearchCreateItemPane.java | 4 +--- .../navigation/ui/category/AbstractTree.java | 1 - .../navigation/ui/object/CategoryFilter.java | 16 +++++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java index 11b58b5cc..72871fda8 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java @@ -90,9 +90,7 @@ class ItemSearchCreateItemPane extends CMSContainer private final NewItemForm m_newItem = new SectionNewItemForm("newItem"); // private final SingleSelectionModel m_model; private SingleSelectionModel m_model; - private final FolderSelectionModel m_folderSel; // To support legacy UI code - // private FolderSelectionModel m_folderSel; // To support legacy UI code - // private final CreationSelector m_creator; + private final FolderSelectionModel m_folderSel; private CreationSelector m_creator; private final FlatFolderPicker m_folderPicker = new FlatFolderPicker(FLAT_FOLDER); 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 1b380f8ce..9de4cf13f 100755 --- a/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java +++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractTree.java @@ -131,7 +131,6 @@ public abstract class AbstractTree extends CategoryComponent { } - s_log.debug("generating node XML for category " + cat.getName()); // replace idPath list with one containing cat.id appended diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java index 678a92d35..5839a8c26 100644 --- a/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java +++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java @@ -141,15 +141,17 @@ public class CategoryFilter { final Element elem = new Element("category"); elem.addAttribute("id", category.getID().toString()); if (multiple) { - if ((values != null) && !values.isEmpty() && values.contains(category.getName())) { - elem.addAttribute("selected", "selected"); - if (searchString.length() > 0) { - searchString.append(' '); + if ((values != null) && !values.isEmpty() && values.contains(category.getName())) { + elem.addAttribute("selected", "selected"); +// if (searchString.length() > 0) { +// searchString.append(separator); +// } + searchString.append(category.getName()); + searchString.append(separator); } - searchString.append(category.getName()); - } } else { - if ((values != null) && !values.isEmpty() && values.contains(category.getID().toString())) { + if ((values != null) && !values.isEmpty() && values. + contains(category.getID().toString())) { elem.addAttribute("selected", "selected"); } }