diff options
| author | Julien Mougenot <jum@odoo.com> | 2020-06-02 15:03:52 +0000 |
|---|---|---|
| committer | Julien Mougenot <jum@odoo.com> | 2020-07-14 09:10:32 +0000 |
| commit | 669c2ebaec701055a15dc56ea90bf2d64bc38154 (patch) | |
| tree | 6711c374432f030d3c375825b65943cdc0186bdc /addons/web/static/src/js/core | |
| parent | b9ad60d5ebe73ee47eba64145ebe27d483a7f33a (diff) | |
[IMP] web: improve eval context dates
This commit handles 2 things:
1) the merging of the `py_utils.context()` into the evaluation context
returned by `BasicModel._getEvalContext` to access the same time-related
keys,
2) the addition of 2 new keys into the `py_utils.context` (thus
transmitted to the basic model): `today` (an alias for the already
present `current_date`) and `now` which represents the current date and
time value.
Task 2269697
Diffstat (limited to 'addons/web/static/src/js/core')
| -rw-r--r-- | addons/web/static/src/js/core/py_utils.js | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/addons/web/static/src/js/core/py_utils.js b/addons/web/static/src/js/core/py_utils.js index 590d5e62fc6..1cf1150ab76 100644 --- a/addons/web/static/src/js/core/py_utils.js +++ b/addons/web/static/src/js/core/py_utils.js @@ -254,14 +254,29 @@ function tz_offset() { function pycontext() { + const d = new Date(); + const today = `${ + String(d.getFullYear()).padStart(4, "0")}-${ + String(d.getMonth() + 1).padStart(2, "0")}-${ + String(d.getDate()).padStart(2, "0")}`; + const now = `${ + String(d.getUTCFullYear()).padStart(4, "0")}-${ + String(d.getUTCMonth() + 1).padStart(2, "0")}-${ + String(d.getUTCDate()).padStart(2, "0")} ${ + String(d.getUTCHours()).padStart(2, "0")}:${ + String(d.getUTCMinutes()).padStart(2, "0")}:${ + String(d.getUTCSeconds()).padStart(2, "0")}`; + + const { datetime, relativedelta, time } = py.extras; return { - datetime: py.extras.datetime, - context_today: context_today, - time: py.extras.time, - relativedelta: py.extras.relativedelta, - current_date: py.PY_call( - py.extras.time.strftime, [py.str.fromJSON('%Y-%m-%d')]), - tz_offset: tz_offset, + current_date: today, + datetime, + time, + now, + today, + relativedelta, + context_today, + tz_offset, }; } |
