entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

misc: use force_str for formdef/workflow xml exports (#36515)

This commit is contained in:
Frédéric Péters 2019-11-13 11:07:25 +01:00
parent a231aa0d97
commit e9f5112fbe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wcs/admin/forms.py
View File

@ -28,7 +28,7 @@ from quixote import get_response, redirect
from quixote.directory import Directory, AccessControlled
from quixote.html import TemplateIO, htmltext
from ..qommon import _
from ..qommon import _, force_str
from ..qommon import misc
from ..qommon.errors import *
from ..qommon.form import *
@ -1174,7 +1174,7 @@ class FormDefPage(Directory):
response.set_content_type('application/x-wcs-form')
response.set_header('content-disposition',
'attachment; filename=%s-%s.wcs' % (self.formdef_export_prefix, self.formdef.url_name))
return '<?xml version="1.0"?>\n' + ET.tostring(x)
return '<?xml version="1.0"?>\n' + force_str(ET.tostring(x))
def archive(self):
if get_publisher().is_using_postgresql():

4
wcs/admin/workflows.py
View File

@ -29,7 +29,7 @@ from quixote import redirect, get_publisher
from quixote.directory import Directory
from quixote.html import TemplateIO, htmltext
from ..qommon import _
from ..qommon import _, force_str
from ..qommon import errors
from ..qommon import misc
from ..qommon.form import *
@ -1671,7 +1671,7 @@ class WorkflowPage(Directory):
response.set_content_type('application/x-wcs-form')
response.set_header('content-disposition',
'attachment; filename=workflow-%s.wcs' % misc.simplify(self.workflow.name))
return '<?xml version="1.0"?>\n' + ET.tostring(x)
return '<?xml version="1.0"?>\n' + force_str(ET.tostring(x))
def get_new_status_form(self):
r = TemplateIO(html=True)