Fixing issue where local model groups where not shown in sitemap view.

deskbuild · Dec 2, 2016 · 21015ea · 21015ea
1 parent e224bdb
commit 21015ea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/org/opencms/ade/configuration/CmsResourceTypeConfig.java b/src/org/opencms/ade/configuration/CmsResourceTypeConfig.java
@@ -476,7 +476,7 @@ public String getFolderPath(CmsObject cms, String pageFolderRootPath) {
             return m_folderOrName.getFolderPath(cms, pageFolderRootPath);
         } else {
             return CmsStringUtil.joinPaths(
-                cms.getRequestContext().getSiteRoot(),
+                OpenCms.getSiteManager().getSiteRoot(pageFolderRootPath),
                 CmsADEManager.CONTENT_FOLDER_NAME,
                 m_typeName);
         }

diff --git a/src/org/opencms/ade/sitemap/CmsModelPageHelper.java b/src/org/opencms/ade/sitemap/CmsModelPageHelper.java
@@ -317,7 +317,6 @@ public List<CmsModelPageEntry> getModelGroups() {
         CmsResourceTypeConfig config = m_adeConfig.getResourceType(
             CmsResourceTypeXmlContainerPage.MODEL_GROUP_TYPE_NAME);
         if ((config != null) && !config.isDisabled()) {
-            config.getFolderPath(m_cms, m_rootResource.getRootPath());
             String modelGroupFolderPath = config.getFolderPath(m_cms, m_adeConfig.getBasePath());
             if (m_cms.existsResource(modelGroupFolderPath)) {
                 try {