From: Benoît Pin Date: Wed, 4 Dec 2013 13:29:53 +0000 (+0100) Subject: On récupère le snipet d’après upload sur le dossier si le contenu n’en a pas de défini. X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/commitdiff_plain/06fa1d97467280400e2031d488e40bb9b658e903?ds=sidebyside On récupère le snipet d’après upload sur le dossier si le contenu n’en a pas de défini. --- diff --git a/Folder.py b/Folder.py index 7b193fe..b762702 100644 --- a/Folder.py +++ b/Folder.py @@ -343,13 +343,19 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : ob.PUT(REQUEST, RESPONSE) ob.orig_name = fileName - + # get method from ob created / refreshed ti = ob.getTypeInfo() method_id = ti.queryMethodID('jsupload_snippet') - meth = method_id and getattr(ob, method_id) or (lambda : 'Not implemented') + meth = getattr(ob, method_id) if method_id else None + if not meth : + # get method from container that receive uploaded content + ti = self.getTypeInfo() + method_id = ti.queryMethodID('jsupload_snippet') + meth = getattr(self, method_id) if method_id else lambda : 'Not implemented' + RESPONSE.setStatus(httpRespCode) RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8') - return '%s' % meth().strip() + return '%s' % meth(ob).strip() # ## overload to maintain ownership if authenticated user has 'Manage portal' permission