tools (common/data_objects): accept same parameters as format en quote their values in OnClick.formatUrl

This commit is contained in:
Goffi 2018-01-24 09:12:12 +01:00
commit 4d7bc8aaa1

View file

@ -26,6 +26,9 @@ except ImportError:
safe = unicode safe = unicode
from sat.tools.common import uri as xmpp_uri from sat.tools.common import uri as xmpp_uri
import urllib
q = lambda value: urllib.quote(value.encode('utf-8'), safe='@')
class BlogItem(object): class BlogItem(object):
@ -314,15 +317,35 @@ class Identities(object):
return jid_str in self.identities return jid_str in self.identities
class ObjectQuoter(object):
"""object wrapper which quote attribues (to be used in templates)"""
def __init__(self, obj):
self.obj = obj
def __unicode__(self):
return q(self.obj.__unicode__())
def __str__(self):
return self.__unicode__()
def __getattr__(self, name):
return q(self.obj.__getattr__(name))
def __getitem__(self, key):
return q(self.obj.__getitem__(key))
class OnClick(object): class OnClick(object):
"""Class to handle clickable elements targets""" """Class to handle clickable elements targets"""
def __init__(self, url=None): def __init__(self, url=None):
self.url = url self.url = url
def formatUrl(self, item): def formatUrl(self, *args, **kwargs):
"""Use an item to format URL """format URL using Python formatting
item will be formatted using "item=item" in format() values will be quoted before being used
""" """
return self.url.format(item=item) return self.url.format(*[q(a) for a in args],
**{k: ObjectQuoter(v) for k,v in kwargs.iteritems()})