From 8e7ce5c19c6486b8a37addff6b26f86d53d37c01 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Thu, 10 Apr 2008 19:22:15 +0000 Subject: [PATCH] Applied patch provided by UTL to fix download action git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/web-client-config-actions.xml | 4 +- .../action/evaluator/DownloadEvaluator.java | 50 ------------------- .../org/alfresco/web/bean/BrowseBean.java | 16 +++++- 3 files changed, 17 insertions(+), 53 deletions(-) delete mode 100644 source/java/org/alfresco/web/action/evaluator/DownloadEvaluator.java diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml index 33e3980605..7591907681 100644 --- a/config/alfresco/web-client-config-actions.xml +++ b/config/alfresco/web-client-config-actions.xml @@ -58,10 +58,9 @@ - org.alfresco.web.action.evaluator.DownloadEvaluator download_doc /images/icons/download_doc.gif - #{actionContext.url} + #{actionContext.downloadUrl} @@ -1174,6 +1173,7 @@ + diff --git a/source/java/org/alfresco/web/action/evaluator/DownloadEvaluator.java b/source/java/org/alfresco/web/action/evaluator/DownloadEvaluator.java deleted file mode 100644 index df3563090d..0000000000 --- a/source/java/org/alfresco/web/action/evaluator/DownloadEvaluator.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.web.action.evaluator; - -import javax.faces.context.FacesContext; - -import org.alfresco.model.ContentModel; -import org.alfresco.service.cmr.dictionary.DictionaryService; -import org.alfresco.web.bean.repository.Node; -import org.alfresco.web.bean.repository.Repository; - -public class DownloadEvaluator extends BaseActionEvaluator -{ - /** - * @see org.alfresco.web.action.ActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node) - */ - public boolean evaluate(Node node) - { - FacesContext fc = FacesContext.getCurrentInstance(); - DictionaryService dd = Repository.getServiceRegistry(fc).getDictionaryService(); - - if (dd.isSubClass(node.getType(), ContentModel.TYPE_CONTENT)) - { - return !node.isLocked(); - } - return false; - } -} diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java index a03416ca6a..924e82488e 100644 --- a/source/java/org/alfresco/web/bean/BrowseBean.java +++ b/source/java/org/alfresco/web/bean/BrowseBean.java @@ -663,6 +663,16 @@ public class BrowseBean implements IContextListener, Serializable { // special properties to be used by the value binding components on the page node.addPropertyResolver("url", this.resolverUrl); + + if (ApplicationModel.TYPE_FILELINK.equals(node.getType())) + { + node.addPropertyResolver("downloadUrl", this.resolverLinkDownload); + } + else + { + node.addPropertyResolver("downloadUrl", this.resolverDownload); + } + node.addPropertyResolver("webdavUrl", this.resolverWebdavUrl); node.addPropertyResolver("cifsPath", this.resolverCifsPath); node.addPropertyResolver("fileType16", this.resolverFileType16); @@ -863,6 +873,7 @@ public class BrowseBean implements IContextListener, Serializable if (destRef != null && new Node(destRef).hasPermission(PermissionService.READ) == true) { node.addPropertyResolver("url", this.resolverLinkUrl); + node.addPropertyResolver("downloadUrl", this.resolverLinkDownload); node.addPropertyResolver("webdavUrl", this.resolverLinkWebdavUrl); node.addPropertyResolver("cifsPath", this.resolverLinkCifsPath); node.addPropertyResolver("fileType16", this.resolverFileType16); @@ -1041,6 +1052,7 @@ public class BrowseBean implements IContextListener, Serializable if (new Node(destRef).hasPermission(PermissionService.READ) == true) { node.addPropertyResolver("url", this.resolverLinkUrl); + node.addPropertyResolver("downloadUrl", this.resolverLinkDownload); node.addPropertyResolver("webdavUrl", this.resolverLinkWebdavUrl); node.addPropertyResolver("cifsPath", this.resolverLinkCifsPath); node.addPropertyResolver("fileType16", this.resolverFileType16); @@ -1180,7 +1192,7 @@ public class BrowseBean implements IContextListener, Serializable if (getNodeService().exists(destRef) == true) { String destName = Repository.getNameForNode(getNodeService(), destRef); - return DownloadContentServlet.generateDownloadURL(node.getNodeRef(), destName); + return DownloadContentServlet.generateDownloadURL(destRef, destName); } else { @@ -1705,10 +1717,12 @@ public class BrowseBean implements IContextListener, Serializable if (ApplicationModel.TYPE_FILELINK.equals(node.getType())) { node.addPropertyResolver("url", this.resolverLinkDownload); + node.addPropertyResolver("downloadUrl", this.resolverLinkDownload); } else { node.addPropertyResolver("url", this.resolverDownload); + node.addPropertyResolver("downloadUrl", this.resolverDownload); } node.addPropertyResolver("webdavUrl", this.resolverWebdavUrl); node.addPropertyResolver("cifsPath", this.resolverCifsPath);