diff options
| author | Khoi Nguyen <bng@odoo.com> | 2017-07-31 17:02:28 +0200 |
|---|---|---|
| committer | Khoi Nguyen <bng@odoo.com> | 2017-08-01 18:03:15 +0200 |
| commit | 597d172ff0eacc4c038c50fe46e5a0f301e126f0 (patch) | |
| tree | affa3aa7efe232d44ded829aa6f43625649a14c1 /addons/web/static/src/js | |
| parent | a42b056ca93a021d30afdb74cda3b6683b9b954f (diff) | |
[FIX] web: always call 'search_read' when loading calendar
This commit reverts
https://github.com/odoo/odoo/commit/2e2ab4e954cd5da8c0c06d393b334cefc7627315
(which ensures that if all filters are 'inactive' then nothing is shown)
for the following reasons:
- It is not necessary since _getFilterDomain was rewritten (see
https://github.com/odoo/odoo/commit/4e12edc023dd20d435f5575b5517a3c11deb8421).
If all filters are inactive, _getFilterDomain does now return an
"in []" domain.
- It shows an empty calendar when filters yield an empty domain.
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_model.js | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/addons/web/static/src/js/views/calendar/calendar_model.js b/addons/web/static/src/js/views/calendar/calendar_model.js index ec3ff8940a7..d2b0c02c524 100644 --- a/addons/web/static/src/js/views/calendar/calendar_model.js +++ b/addons/web/static/src/js/views/calendar/calendar_model.js @@ -387,19 +387,16 @@ return AbstractModel.extend({ this.data.fc_options = this._getFullCalendarOptions(); var defs = _.map(this.data.filters, this._loadFilter.bind(this)); + return $.when.apply($, defs).then(function () { - var eventsDef = $.Deferred().resolve([]); - var filterDomain = self._getFilterDomain(); - if (filterDomain.length || _.isEmpty(self.data.filters)) { - eventsDef = self._rpc({ + return self._rpc({ model: self.modelName, method: 'search_read', context: self.data.context, fields: self.fieldNames, - domain: self.data.domain.concat(self._getRangeDomain()).concat(filterDomain) - }); - } - return eventsDef.then(function (events) { + domain: self.data.domain.concat(self._getRangeDomain()).concat(self._getFilterDomain()) + }) + .then(function (events) { self._parseServerData(events); self.data.data = _.map(events, self._recordToCalendarEvent.bind(self)); return $.when( |
