summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-02-05 17:53:35 +0100
committerChristophe Simonis <chs@odoo.com>2019-02-05 17:53:35 +0100
commit9c6acbaaa0a9515c134ccabb26232b0acf18f408 (patch)
tree1cf8b72add390389c798b90ad88ffd220dddb629 /addons/web/static
parentaeed32d4ffd8529da3c3fbcb091397ca375057f0 (diff)
parente0b14bf9a7aa6609db1e8e76f0771d52e0257464 (diff)
[MERGE] forward port branch 11.0 up to e0b14bf9a7a
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/src/js/chrome/search_inputs.js6
-rw-r--r--addons/web/static/src/less/list_view.less1
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/web/static/src/js/chrome/search_inputs.js b/addons/web/static/src/js/chrome/search_inputs.js
index e7d39bb1680..18185de3615 100644
--- a/addons/web/static/src/js/chrome/search_inputs.js
+++ b/addons/web/static/src/js/chrome/search_inputs.js
@@ -342,7 +342,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/less/list_view.less b/addons/web/static/src/less/list_view.less
index e56e94fff93..54cc370878f 100644
--- a/addons/web/static/src/less/list_view.less
+++ b/addons/web/static/src/less/list_view.less
@@ -51,7 +51,6 @@
}
&:not(:empty)::after {
margin-left: 6px;
- position: absolute;
}
&.o-sort-up {
cursor: n-resize;