Commit 4f7c5dd1 authored by Ivan Tyagov's avatar Ivan Tyagov

Use force user identification for all OOo documents extensible subcontent.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36532 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent dacfffdc
...@@ -47,6 +47,7 @@ from Products.ERP5Type.Cache import CachingMethod ...@@ -47,6 +47,7 @@ from Products.ERP5Type.Cache import CachingMethod
from Products.ERP5.Document.File import File from Products.ERP5.Document.File import File
from Products.ERP5.Document.Document import Document, PermanentURLMixIn,\ from Products.ERP5.Document.Document import Document, PermanentURLMixIn,\
VALID_IMAGE_FORMAT_LIST, ConversionError, NotConvertedError VALID_IMAGE_FORMAT_LIST, ConversionError, NotConvertedError
from AccessControl.SecurityManagement import setSecurityManager
from zLOG import LOG, ERROR from zLOG import LOG, ERROR
# Mixin Import # Mixin Import
...@@ -471,15 +472,20 @@ class OOoDocument(PermanentURLMixIn, BaseConvertableFileMixin, File, ...@@ -471,15 +472,20 @@ class OOoDocument(PermanentURLMixIn, BaseConvertableFileMixin, File,
def _getExtensibleContent(self, request, name): def _getExtensibleContent(self, request, name):
# Be sure that html conversion is done, # Be sure that html conversion is done,
# as it is required to extract extensible content # as it is required to extract extensible content
try: old_manager, user = self._forceIdentification(request)
self._convert(format='html')
web_cache_kw = {'name': name, web_cache_kw = {'name': name,
'format': EMBEDDED_FORMAT} 'format': EMBEDDED_FORMAT}
try:
self._convert(format='html')
_setCacheHeaders(_ViewEmulator().__of__(self), web_cache_kw) _setCacheHeaders(_ViewEmulator().__of__(self), web_cache_kw)
mime, data = self.getConversion(format=EMBEDDED_FORMAT, file_name=name) mime, data = self.getConversion(format=EMBEDDED_FORMAT, file_name=name)
return OFSFile(name, name, data, content_type=mime).__of__(self.aq_parent) document = OFSFile(name, name, data, content_type=mime).__of__(self.aq_parent)
except (NotConvertedError, ConversionError, KeyError): except (NotConvertedError, ConversionError, KeyError):
return PermanentURLMixIn._getExtensibleContent(self, request, name) document = PermanentURLMixIn._getExtensibleContent(self, request, name)
# restore original security context if there's a logged in user
if user is not None:
setSecurityManager(old_manager)
return document
security.declarePrivate('_convertToBaseFormat') security.declarePrivate('_convertToBaseFormat')
def _convertToBaseFormat(self): def _convertToBaseFormat(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment