Mercurial > libervia-backend
changeset 3311:29f8122f00f3
tools (common/template): use `to_json` instead of `json` + added missing args to `date_fmt`
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Thu, 16 Jul 2020 09:07:26 +0200 |
| parents | e4121a1f2399 |
| children | 77177b13ff54 |
| files | sat/tools/common/template.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/sat/tools/common/template.py Thu Jul 16 09:07:26 2020 +0200 +++ b/sat/tools/common/template.py Thu Jul 16 09:07:26 2020 +0200 @@ -454,7 +454,7 @@ 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 @@ 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: