From 7c4406c9f7efac30e071dc4c6df8aeeb8dd5e79f Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 1 Feb 2007 15:57:37 +0000 Subject: [PATCH] Fix for http://issues.alfresco.com/browse/WCM-282 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/bean/wcm/SubmitDialog.java | 11 +++++++++++ source/web/jsp/wcm/submit-dialog.jsp | 17 +++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java index fca720f850..2aa33fc91b 100644 --- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java @@ -56,6 +56,7 @@ import org.alfresco.web.app.Application; import org.alfresco.web.app.servlet.DownloadContentServlet; import org.alfresco.web.bean.BrowseBean; import org.alfresco.web.bean.dialog.BaseDialogBean; +import org.alfresco.web.config.ClientConfigElement; import org.alfresco.web.forms.FormInstanceData; import org.alfresco.web.forms.FormInstanceDataImpl; import org.alfresco.web.forms.Rendition; @@ -882,6 +883,16 @@ public class SubmitDialog extends BaseDialogBean AVMNodeConverter.ToNodeRef(-1, descriptor.getPath()), descriptor.getName()); } + public String getPreviewUrl() + { + ClientConfigElement config = Application.getClientConfig(FacesContext.getCurrentInstance()); + String dns = AVMConstants.lookupStoreDNS(AVMConstants.getStoreName(descriptor.getPath())); + return AVMConstants.buildAssetUrl(AVMConstants.getSandboxRelativePath(descriptor.getPath()), + config.getWCMDomain(), + config.getWCMPort(), + dns); + } + public AVMNodeDescriptor getDescriptor() { return this.descriptor; diff --git a/source/web/jsp/wcm/submit-dialog.jsp b/source/web/jsp/wcm/submit-dialog.jsp index 96b034b1cf..02aa37d42b 100644 --- a/source/web/jsp/wcm/submit-dialog.jsp +++ b/source/web/jsp/wcm/submit-dialog.jsp @@ -125,7 +125,7 @@ - <%-- Description columns --%> + <%-- Description column --%> @@ -133,7 +133,7 @@ - <%-- Description columns --%> + <%-- Path column --%> @@ -182,7 +182,7 @@ - <%-- Description columns --%> + <%-- Description column --%> @@ -190,7 +190,7 @@ - <%-- Description columns --%> + <%-- Path column --%> @@ -208,6 +208,15 @@ + <%-- Actions column --%> + + + + + + + +