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

Bugfix für den Kategorienfilter (Separator für mehrere Kategorien wurde nicht überall beachtet) 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2437 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-11-15 08:02:28 +00:00
parent 35647b1d2b
commit 98110662e7
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java
View File

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

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

@ -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

16
ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java
View File

@ -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");
}
}