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

Bugfixes for FreemarkerPresentationManager 

git-svn-id: https://svn.libreccm.org/ccm/trunk@6204 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-09-14 13:45:25 +00:00
parent d59d3a4dc4
commit bd58ff9eb0
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-core/src/com/arsdigita/categorization/Category.java
View File

@ -2114,7 +2114,7 @@ public class Category extends ACSObject {
private static DataCollection getRootCategoriesAssoc(ACSObject acsObj) {
if (acsObj == null) {
throw new NullPointerException("acsObj");
throw new NullPointerException("provided acsObj is null");
}
DataCollection dc = SessionManager.getSession().retrieve(

2
ccm-core/src/com/arsdigita/kernel/security/OneLoginUtil.java
View File

@ -42,7 +42,7 @@ public final class OneLoginUtil {
settings.put("onelogin.saml2.sp.entityid",
securityConfig.getOneLoginSaml2SpEntityId());
settings.put("onelogin.saml2.sp.assertation.consumer_service.url",
URL.there(request, LoginServlet.APPLICATION_NAME));
URL.there(request, "/" + LoginServlet.APPLICATION_NAME));
settings.put(
"onelogin.saml2.sp.assertation_consumer_service.binding",
securityConfig.getOneLoginSaml2SpAssertationConsumerServiceBinding());

4
ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
View File

@ -80,6 +80,10 @@
<xsl:apply-templates select="$data-tree/bebop:form" />
</xsl:when>
<xsl:when test="$data-tree/bebop:boxPanel">
<xsl:apply-templates select="$data-tree/bebop:boxPanel" />
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:layoutPanel/bebop:body
| $data-tree//bebop:currentPane/bebop:layoutPanel/bebop:right

2
ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java
View File

@ -98,7 +98,7 @@ public class ThemeDirectorConfig extends AbstractConfig {
private final Parameter m_fileExtParam = new StringParameter(
"themedirector.file_extensions",
Parameter.REQUIRED,
"bmp css eot gif jpeg jpg js less otf png svg ttf woff woff2 xml xsl");
"bmp css eot ftl gif jpeg jpg js less otf png scss svg ttf woff woff2 xml xsl");
/**
* Specifies the less file(s) used as entry point(s) for compiling a managed

13
ccm-themedirector/src/org/libreccm/theming/FreeMarkerPresentationManager.java
View File

@ -51,12 +51,17 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
public class FreeMarkerPresentationManager implements PresentationManager {
private static final Logger LOGGER = Logger
.getLogger(FreeMarkerPresentationManager.class);
@Override
public void servePage(final Document document,
final HttpServletRequest request,
@ -72,7 +77,8 @@ public class FreeMarkerPresentationManager implements PresentationManager {
final Node root = w3cDocument.getDocumentElement();
final String currentSiteName = Web.getConfig().getSiteName();
// final String currentSiteName = Web.getConfig().getSiteName();
final String currentSiteName = request.getServerName();
Site subSite;
try {
subSite = Site.findByHostname(currentSiteName);
@ -120,6 +126,11 @@ public class FreeMarkerPresentationManager implements PresentationManager {
final InputStream manifestInputStream = servletContext
.getResourceAsStream(themeManifestPath);
if (manifestInputStream == null) {
LOGGER.error(String.format("No theme manifest found at path \"%s\". "
+ "Falling back to \"%s\". Used sitename \"%s\".",
themeManifestPath,
PageTransformer.class.getName(),
currentSiteName));
final PageTransformer pageTransformer = new PageTransformer();
pageTransformer.servePage(document, request, response);
return;