inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for http://issues.alfresco.com/browse/WCM-282

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-02-01 15:57:37 +00:00
parent aeaeffc649
commit 7c4406c9f7
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
View File

@@ -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;

17
source/web/jsp/wcm/submit-dialog.jsp
View File

@@ -125,7 +125,7 @@
<h:outputText id="col1-name2" value="#{r.name}" rendered="#{r.deleted}" />
</a:column>
<%-- Description columns --%>
<%-- Description column --%>
<a:column id="col2" width="200" style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
@@ -133,7 +133,7 @@
<h:outputText id="col2-desc" value="#{r.description}" />
</a:column>
<%-- Description columns --%>
<%-- Path column --%>
<a:column id="col3" style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.path}" value="path" styleClass="header"/>
@@ -182,7 +182,7 @@
<h:outputText id="col10-name2" value="#{r.name}" rendered="#{r.deleted}" />
</a:column>
<%-- Description columns --%>
<%-- Description column --%>
<a:column id="col11" width="200" style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
@@ -190,7 +190,7 @@
<h:outputText id="col11-desc" value="#{r.description}" />
</a:column>
<%-- Description columns --%>
<%-- Path column --%>
<a:column id="col12" style="text-align:left">
<f:facet name="header">
<a:sortLink label="#{msg.path}" value="path" styleClass="header"/>
@@ -208,6 +208,15 @@
</h:outputText>
</a:column>
<%-- Actions column --%>
<a:column id="col14" actions="true" style="text-align:left">
<f:facet name="header">
<h:outputText id="col14-txt" value="#{msg.actions}"/>
</f:facet>
<a:actionLink value="#{msg.file_preview}" image="/images/icons/preview_website.gif" href="#{r.previewUrl}" target="new" />
</a:column>
<a:dataPager styleClass="pager" />
</a:richList>
</h:panelGroup>