Move the openoffice validation test before the convert

It was not performed when format was passed


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34758 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6ed497fe
...@@ -559,6 +559,14 @@ class OOoTemplate(ZopePageTemplate): ...@@ -559,6 +559,14 @@ class OOoTemplate(ZopePageTemplate):
else: else:
ooo = ooo_builder.render(name=self.title or self.id) ooo = ooo_builder.render(name=self.title or self.id)
if DevelopmentMode:
# Validate XML in development mode
from Products.ERP5OOo.tests.utils import Validator
err_list = Validator().validate(ooo)
if err_list:
LOG('ERP5OOo', PROBLEM,
'Validation of %s failed:\n%s' % (self.getId(), ''.join(err_list)))
format = opts.get('format', request.get('format', None)) format = opts.get('format', request.get('format', None))
if format: if format:
return self._asFormat(ooo, format, request, batch_mode) return self._asFormat(ooo, format, request, batch_mode)
...@@ -570,14 +578,6 @@ class OOoTemplate(ZopePageTemplate): ...@@ -570,14 +578,6 @@ class OOoTemplate(ZopePageTemplate):
'inline;filename="%s%s"' % (self._getFileName(), 'inline;filename="%s%s"' % (self._getFileName(),
guess_extension(self.content_type) or '')) guess_extension(self.content_type) or ''))
if DevelopmentMode:
# Validate XML in development mode
from Products.ERP5OOo.tests.utils import Validator
err_list = Validator().validate(ooo)
if err_list:
LOG('ERP5OOo', PROBLEM,
'Validation of %s failed:\n%s' % (self.getId(), ''.join(err_list)))
return ooo return ooo
def om_icons(self): def om_icons(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