From b30d0becf3d700badab2cac1363c825ab0872add Mon Sep 17 00:00:00 2001 From: jensp Date: Sun, 18 Jan 2015 13:39:56 +0000 Subject: [PATCH] Some fixes. git-svn-id: https://svn.libreccm.org/ccm/trunk@3092 8810af33-2d31-482b-a856-94f89814c4df --- .../navigation/ui/category/AbstractList.java | 11 +++++++++-- .../com/arsdigita/navigation/ui/category/Root.java | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractList.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractList.java index 64393e27a..3f5c04a22 100755 --- a/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractList.java +++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/AbstractList.java @@ -84,14 +84,21 @@ public abstract class AbstractList extends CategoryComponent { return content; } + @Override protected Element generateCategoryXML(HttpServletRequest request, HttpServletResponse response, BigDecimal id, String title, + String urlStub, String description, String url) { - Element e = super.generateCategoryXML( request, response, id, title, - description, url ); + Element e = super.generateCategoryXML( request, + response, + id, + title, + urlStub, + description, + url ); Category cat = getModel().getCategory(); if( null != cat && cat.getID().equals( id ) ) { diff --git a/ccm-navigation/src/com/arsdigita/navigation/ui/category/Root.java b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Root.java index 3b701c992..3703cea31 100755 --- a/ccm-navigation/src/com/arsdigita/navigation/ui/category/Root.java +++ b/ccm-navigation/src/com/arsdigita/navigation/ui/category/Root.java @@ -49,6 +49,7 @@ public class Root extends CategoryComponent { response, root.getID(), root.getName(), + root.getURL(), root.getDescription(), URL.here(Web.getRequest(), "/").toString()));