From f1d71671ae16ff0f9d4889bc76479d099c48bac3 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 8 Oct 2013 09:18:33 +0000 Subject: [PATCH] =?UTF-8?q?-=20Beim=20Kategorienfilter=20kann=20jetzt=20be?= =?UTF-8?q?stimmt=20werden,=20ob=20es=20m=C3=B6glich=20ist,=20mehrere=20M?= =?UTF-8?q?=C3=B6glichkeiten=20auszuw=C3=A4hlen=20(setMultiple).=20-=20For?= =?UTF-8?q?matierungen=20usw.=20in=20PublicPersonalProfileNavigationTable.?= =?UTF-8?q?java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@2339 8810af33-2d31-482b-a856-94f89814c4df --- .../ui/PublicPersonalProfileNavigationTable.java | 2 +- .../navigation/ui/object/CategoryFilter.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java index df9f39b09..1a22dac25 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileNavigationTable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Jens Pelzetter + * Copyright (c) 2011, 2013 Jens Pelzetter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License 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 e754fea8c..722b8784b 100644 --- a/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java +++ b/ccm-navigation/src/com/arsdigita/navigation/ui/object/CategoryFilter.java @@ -22,6 +22,7 @@ public class CategoryFilter { private final String label; private String separator = " "; + private boolean multiple = true; private final Category filterRootCat; private final List values = new ArrayList(); private final Map catNameToCatId = new HashMap(); @@ -101,6 +102,12 @@ public class CategoryFilter { filter.newChildElement("searchString").setText(searchString.toString()); filter.newChildElement("categoriesStr").setText(categoriesStr.toString()); filter.newChildElement("separator").setText(separator); + final Element multipleElem = filter.newChildElement("multiple"); + if (multiple) { + multipleElem.setText("true"); + } else { + multipleElem.setText("false"); + } for (String value : values) { if (!catNameToCatId.containsKey(value)) { @@ -145,6 +152,14 @@ public class CategoryFilter { public void setSeparator(final String separator) { this.separator = separator; } + + public boolean isMultiple() { + return multiple; + } + + public void setMultiple(final boolean multiple) { + this.multiple = multiple; + } public void setValue(final String value) { if ((value != null) && !value.isEmpty()) {