From ad30929cfb055af2653eb559304a5290c084509a Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 31 Mar 2014 10:48:37 +0200 Subject: [PATCH 1/2] allow creation of resources within special concepts via showCreateResource option --- browser/common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/common.py b/browser/common.py index a426dbc..d31deba 100755 --- a/browser/common.py +++ b/browser/common.py @@ -794,6 +794,8 @@ class BaseView(GenericView, I18NView): def checkAction(self, name, category, target): if name in ('create_resource',): + if target is not None and target.options.showCreateResource: + return True return not self.globalOptions('hideCreateResource') return True From 70b473a48a0c019c330d32d8e17cea451680755a Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 31 Mar 2014 11:17:26 +0200 Subject: [PATCH 2/2] allow specification of filename on download --- browser/resource.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/browser/resource.py b/browser/resource.py index 2b7a7ec..7d35c0c 100644 --- a/browser/resource.py +++ b/browser/resource.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2012 Helmut Merz helmutm@cy55.de +# Copyright (c) 2014 Helmut Merz helmutm@cy55.de # # 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 @@ -188,7 +188,7 @@ class ResourceView(BaseView): return DocumentView(context, self.request) return self - def show(self, useAttachment=False): + def show(self, useAttachment=False, filename=None): """ show means: "download"...""" # TODO: control access, e.g. to protected images # if self.adapted.isProtected(): @@ -205,12 +205,17 @@ class ResourceView(BaseView): from loops.media.browser.asset import MediaAssetView view = MediaAssetView(context, self.request) return view.show(useAttachment) + else: + response.setHeader('Cache-Control', '') + response.setHeader('Pragma', '') ti = IType(context).typeInterface if ti is not None: context = ti(context) data = context.data if useAttachment: - filename = adapted(self.context).localFilename or getName(self.context) + if filename is None: + filename = (adapted(self.context).localFilename or + getName(self.context)) if self.typeOptions('no_normalize_download_filename'): filename = '"%s"' % filename else: