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

backoffice: use force_str for query parameter (#36515)

This commit is contained in:
Frédéric Péters 2019-11-13 22:41:36 +01:00
parent 03f2634895
commit 95d29ec088
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wcs/backoffice/management.py
View File

@ -35,7 +35,7 @@ from quixote import get_session, get_publisher, get_request, get_response, redir
from quixote.directory import Directory
from quixote.html import TemplateIO, htmltext, htmlescape
from ..qommon import _, ngettext, ezt
from ..qommon import _, ngettext, ezt, force_str
from ..qommon.admin.emails import EmailsDirectory
from ..qommon.admin.menu import command_icon
from ..qommon.backoffice.menu import html_top
@ -339,10 +339,8 @@ class UsersViewDirectory(Directory):
r += htmltext('<h3>%s</h3>') % _('Search')
if get_request().form.get('q'):
q = get_request().form.get('q')
if type(q) is not unicode:
q = force_text(q, get_publisher().site_charset)
r += htmltext('<input name="q" value="%s">') % q.encode(get_publisher().site_charset)
q = force_text(get_request().form.get('q'))
r += htmltext('<input name="q" value="%s">') % force_str(q)
else:
r += htmltext('<input name="q">')
r += htmltext('<input type="submit" value="%s"/>') % _('Search')
@ -1181,10 +1179,8 @@ class FormPage(Directory):
if get_publisher().is_using_postgresql():
r += htmltext('<h3>%s</h3>') % _('Search')
if get_request().form.get('q'):
q = get_request().form.get('q')
if type(q) is not unicode:
q = force_text(q, get_publisher().site_charset)
r += htmltext('<input class="inline-input" name="q" value="%s">') % q.encode(get_publisher().site_charset)
q = force_text(get_request().form.get('q'))
r += htmltext('<input class="inline-input" name="q" value="%s">') % force_str(q)
else:
r += htmltext('<input class="inline-input" name="q">')
r += htmltext('<input type="submit" class="side-button" value="%s"/>') % _('Search')