diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-02-06 11:59:44 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-02-06 11:59:44 +0100 |
| commit | 530f364547af1cc4ccfa9baa66cd70e564bc62cb (patch) | |
| tree | 9b5d7df7051c5c81ac8503b4f8aebb453eb5ef73 /addons/web/static/src | |
| parent | 44da9c91f9d050f42b153269479357371a5b53a6 (diff) | |
| parent | 0c42a607ece06b6295ba9d2c71bd8862e4e253ae (diff) | |
[MERGE] forward port branch saas-11.3 up to 0c42a607ece
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/search/search_inputs.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/scss/list_view.scss | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/search/search_inputs.js b/addons/web/static/src/js/views/search/search_inputs.js index 43fbea08f9c..d92616cfe3e 100644 --- a/addons/web/static/src/js/views/search/search_inputs.js +++ b/addons/web/static/src/js/views/search/search_inputs.js @@ -347,7 +347,11 @@ var BooleanField = SelectionField.extend(/** @lends instance.web.search.BooleanF var DateField = Field.extend(/** @lends instance.web.search.DateField# */{ value_from: function (facetValue) { var serverFormat = (this.attrs && this.attrs.type === 'datetime') ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'; - return facetValue.get('valueAsMoment').clone().format(serverFormat); + if (facetValue.get('valueAsMoment')) { + return facetValue.get('valueAsMoment').clone().format(serverFormat); + } else { + return moment(facetValue.get('value')).format(serverFormat); + } }, complete: function (needle) { // Make sure the needle has a correct format before the creation of the moment object. See diff --git a/addons/web/static/src/scss/list_view.scss b/addons/web/static/src/scss/list_view.scss index 770508ac1b8..85b9b9f6f07 100644 --- a/addons/web/static/src/scss/list_view.scss +++ b/addons/web/static/src/scss/list_view.scss @@ -52,7 +52,6 @@ } &:not(:empty)::after { margin-left: 6px; - position: absolute; } &.o-sort-up { cursor: n-resize; |
