From 80b00cede8c528131c7c767a6f64c94415d3f89f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 5 Aug 2021 12:34:34 +0200 Subject: [PATCH] Use clean URL data path for images. --- .../src/org/argeo/cms/ui/util/CmsUiUtils.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java index e42894db7..75cff0fff 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java @@ -20,6 +20,7 @@ import org.argeo.cms.ui.CmsConstants; import org.argeo.cms.ui.CmsView; import org.argeo.eclipse.ui.Selected; import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils; +import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.service.ResourceManager; @@ -330,7 +331,13 @@ public class CmsUiUtils implements CmsConstants { } public static String img(String serverBase, Node fileNode, String width, String height) { - String src = (serverBase != null ? serverBase : "") + NodeUtils.getDataPath(fileNode); +// String src = (serverBase != null ? serverBase : "") + NodeUtils.getDataPath(fileNode); + String src; + try { + src = (serverBase != null ? serverBase : "") + getDataPathForUrl(fileNode); + } catch (RepositoryException e) { + throw new JcrException("Cannot get URL data path for " + fileNode, e); + } return imgBuilder(src, width, height).append("/>").toString(); } -- 2.30.2