erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools (common/template): use to_json instead of json + added missing args to date_fmt

Browse source
This commit is contained in:
Goffi 2020-07-16 09:07:26 +02:00
commit 820fa05d49
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sat/tools/common/template.py
View file

@ -454,7 +454,7 @@ class Renderer(object):
self.env.policies["json.dumps_kwargs"] = {
"sort_keys": True,
# if object can't be serialised, we use None
"default": lambda o: o.json() if hasattr(o, "json") else None
"default": lambda o: o.to_json() if hasattr(o, "to_json") else None
}
def getFrontURL(self, template_data, path=None):
@ -734,8 +734,8 @@ class Renderer(object):
current = ctx["gidx"].current(value)
return value if not current else "{}_{}".format(value, current)
def _date_fmt(self, timestamp, fmt="short", date_only=False, auto_limit=None,
auto_old_fmt=None):
def _date_fmt(self, timestamp, fmt="short", date_only=False, auto_limit=7,
auto_old_fmt="short", auto_new_fmt="relative"):
if is_undefined(fmt):
fmt = "short"
try: