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

git-svn-id: https://svn.libreccm.org/ccm/trunk@2323 8810af33-2d31-482b-a856-94f89814c4df

master
jensp 2013-09-22 12:04:56 +00:00
parent 9c7a117618
commit ded554211d
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
View File

@ -91,7 +91,7 @@ public class CustomizableObjectList extends ComplexObjectList {
private final Map<String, Filter> filters = private final Map<String, Filter> filters =
new LinkedHashMap<String, Filter>(); new LinkedHashMap<String, Filter>();
private CategoryFilter categoryFilter; //private CategoryFilter categoryFilter;
/** /**
* The available sort fields. We use an {@link LinkedHashMap} here to * The available sort fields. We use an {@link LinkedHashMap} here to
* preserve the insertation order. * preserve the insertation order.
@ -177,12 +177,12 @@ public class CustomizableObjectList extends ComplexObjectList {
filters.put(label, filter); filters.put(label, filter);
} }
public CategoryFilter addCategoryFilter(final String label, // public CategoryFilter addCategoryFilter(final String label,
final String rootCategory) { // final String rootCategory) {
categoryFilter = CategoryFilter.createCategoryFilter(label, rootCategory); // categoryFilter = CategoryFilter.createCategoryFilter(label, rootCategory);
//
return categoryFilter; // return categoryFilter;
} // }
/** /**
* Add a sort field option. * Add a sort field option.
@ -247,9 +247,9 @@ public class CustomizableObjectList extends ComplexObjectList {
final DataCollection objects = super.getObjects(request, response); final DataCollection objects = super.getObjects(request, response);
if ((objects != null) && (categoryFilter != null)) { // if ((objects != null) && (categoryFilter != null)) {
categoryFilter.applyFilter(objects); // categoryFilter.applyFilter(objects);
} // }
return objects; return objects;
} }
@ -326,13 +326,13 @@ public class CustomizableObjectList extends ComplexObjectList {
filterEntry.getValue().setValue(value); filterEntry.getValue().setValue(value);
} }
} }
if (categoryFilter != null) { // if (categoryFilter != null) {
final String value = Globalization.decodeParameter(request, "categoryFilter"); // final String value = Globalization.decodeParameter(request, "categoryFilter");
//
if ((value != null) && !value.isEmpty()) { // if ((value != null) && !value.isEmpty()) {
categoryFilter.setValue(value); // categoryFilter.setValue(value);
} // }
} // }
final Element controls = content.newChildElement("filterControls"); final Element controls = content.newChildElement("filterControls");
controls.addAttribute("customName", m_customName); controls.addAttribute("customName", m_customName);
@ -341,9 +341,9 @@ public class CustomizableObjectList extends ComplexObjectList {
for (Map.Entry<String, Filter> filterEntry : filters.entrySet()) { for (Map.Entry<String, Filter> filterEntry : filters.entrySet()) {
filterElems.addContent(filterEntry.getValue().getXml()); filterElems.addContent(filterEntry.getValue().getXml());
} }
if (categoryFilter != null) { // if (categoryFilter != null) {
filterElems.addContent(categoryFilter.getXml()); // filterElems.addContent(categoryFilter.getXml());
} // }
if (!sortFields.isEmpty()) { if (!sortFields.isEmpty()) {
//Look for a sort parameter. If one is found, use one to sort the data //Look for a sort parameter. If one is found, use one to sort the data