From bd3bdbf53747712978c94092004b439bb8d2979f Mon Sep 17 00:00:00 2001 From: hplattner Date: Fri, 26 Jul 2013 14:59:12 +0200 Subject: [PATCH] fix: media asset download adapter --- browser/form.py | 0 media/browser/asset.py | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 browser/form.py diff --git a/browser/form.py b/browser/form.py old mode 100644 new mode 100755 diff --git a/media/browser/asset.py b/media/browser/asset.py index 630a1c8..a03d0ee 100644 --- a/media/browser/asset.py +++ b/media/browser/asset.py @@ -25,12 +25,14 @@ $Id$ """ from zope.app.pagetemplate import ViewPageTemplateFile +from zope.app.container.contained import NameChooser from zope.cachedescriptors.property import Lazy from zope.security.interfaces import Unauthorized +from zope.traversing.api import getParent from loops.browser.node import NodeView from loops.browser.resource import ResourceView, resource_macros -from loops.common import adapted +from loops.common import adapted, normalizeName from loops.util import _ from loops import util @@ -62,7 +64,7 @@ class MediaAssetView(ResourceView): if useAttachment: filename = obj.localFilename or getName(self.context) #filename = urllib.quote(filename) - filename = NameChooser(getParent(self.context)).normalizeName(filename) + filename = NameChooser(getParent(self.context)).chooseName(filename, self.context) response.setHeader('Content-Disposition', 'attachment; filename=%s' % filename) return data