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

Added several missing data the XML of categories created by Public Personal Profile (the missing data was causing problems in Freemarker based themes) 

git-svn-id: https://svn.libreccm.org/ccm/trunk@6250 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-10-04 17:07:22 +00:00
parent d9fe7000d3
commit e183cc9ef2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
View File

@ -121,7 +121,7 @@ public class PublicPersonalProfileXmlUtil {
} else { } else {
navHome.addAttribute("isSelected", "false"); navHome.addAttribute("isSelected", "false");
} }
navHome.addAttribute("sortKey", ""); navHome.addAttribute("sortKey", "0");
final Element navHierarchyHome = navHierarchyRoot final Element navHierarchyHome = navHierarchyRoot
.newChildElement("nav:category", .newChildElement("nav:category",
@ -134,7 +134,7 @@ public class PublicPersonalProfileXmlUtil {
} else { } else {
navHierarchyHome.addAttribute("isSelected", "false"); navHierarchyHome.addAttribute("isSelected", "false");
} }
navHierarchyHome.addAttribute("sortKey", ""); navHierarchyHome.addAttribute("sortKey", "0");
/*String homeLabel = homeLabels.get(GlobalizationHelper. /*String homeLabel = homeLabels.get(GlobalizationHelper.
getNegotiatedLocale().getLanguage());*/ getNegotiatedLocale().getLanguage());*/
@ -257,17 +257,20 @@ public class PublicPersonalProfileXmlUtil {
Collections.sort(navLinks); Collections.sort(navLinks);
int sortKey = 1;
for (NavLink navLink : navLinks) { for (NavLink navLink : navLinks) {
navElem = navList.newChildElement("nav:category", navElem = navList.newChildElement("nav:category",
"http://ccm.redhat.com/navigation"); "http://ccm.redhat.com/navigation");
navElem.addAttribute("AbstractTree", "AbstractTree"); navElem.addAttribute("AbstractTree", "AbstractTree");
navElem.addAttribute("id", navLink.getKey());
navElem.addAttribute("description", ""); navElem.addAttribute("description", "");
navHierarchyElem = navHierarchyRoot navHierarchyElem = navHierarchyRoot
.newChildElement("nav:category", .newChildElement("nav:category",
"http://ccm.redhat.com/navigation"); "http://ccm.redhat.com/navigation");
navHierarchyElem.addAttribute("AbstractTree", "AbstractTree"); navHierarchyElem.addAttribute("AbstractTree", "AbstractTree");
navHierarchyElem.addAttribute("id", navLink.getKey());
navHierarchyElem.addAttribute("depth", "0"); navHierarchyElem.addAttribute("depth", "0");
navHierarchyElem.addAttribute("description", ""); navHierarchyElem.addAttribute("description", "");
@ -300,8 +303,8 @@ public class PublicPersonalProfileXmlUtil {
} else { } else {
navElem.addAttribute("isSelected", "false"); navElem.addAttribute("isSelected", "false");
} }
navElem.addAttribute("sortKey", ""); navElem.addAttribute("sortKey", Integer.toString(sortKey));
navHierarchyElem.addAttribute("sortKey", ""); navHierarchyElem.addAttribute("sortKey", Integer.toString(sortKey));
if (navLink.getTarget() == null) { if (navLink.getTarget() == null) {
navElem.addAttribute("title", navLink.getKey()); navElem.addAttribute("title", navLink.getKey());
navHierarchyElem.addAttribute("title", navLink.getKey()); navHierarchyElem.addAttribute("title", navLink.getKey());
@ -346,7 +349,7 @@ public class PublicPersonalProfileXmlUtil {
navElem.addAttribute("navItem", navLink.getKey()); navElem.addAttribute("navItem", navLink.getKey());
navHierarchyElem.addAttribute("navItem", navLink.getKey()); navHierarchyElem.addAttribute("navItem", navLink.getKey());
sortKey++;
} }
} }