diff --git a/addons/web/static/src/js/views/abstract_view.js b/addons/web/static/src/js/views/abstract_view.js
index 644ba8ac985..9a73ad67057 100644
--- a/addons/web/static/src/js/views/abstract_view.js
+++ b/addons/web/static/src/js/views/abstract_view.js
@@ -266,7 +266,7 @@ var AbstractView = Class.extend({
}
defs.push(parent.loadViews(
field.relation,
- new Context(context, self.userContext),
+ new Context(context, self.userContext, self.loadParams.context),
[[null, attrs.mode === 'tree' ? 'list' : attrs.mode]])
.then(function (views) {
for (var viewName in views) {
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 c8b9fd574b2..eb6d7176884 100644
--- a/addons/web/static/src/js/views/calendar/calendar_model.js
+++ b/addons/web/static/src/js/views/calendar/calendar_model.js
@@ -614,7 +614,8 @@ return AbstractModel.extend({
if (this.mapping.all_day && evt[this.mapping.all_day]) {
date_stop.add(1, 'days');
}
-
+ var isAllDay = this.fields[this.mapping.date_start].type === 'date' ||
+ this.mapping.all_day && evt[this.mapping.all_day] || false;
var r = {
'record': evt,
'start': date_start,
@@ -622,7 +623,7 @@ return AbstractModel.extend({
'r_start': date_start,
'r_end': date_stop,
'title': the_title,
- 'allDay': this.mapping.all_day && evt[this.mapping.all_day] || false,
+ 'allDay': isAllDay,
'id': evt.id,
'attendees':attendees,
};
diff --git a/addons/web/static/tests/helpers/mock_server.js b/addons/web/static/tests/helpers/mock_server.js
index 3f97df1d4bf..eb78153265c 100644
--- a/addons/web/static/tests/helpers/mock_server.js
+++ b/addons/web/static/tests/helpers/mock_server.js
@@ -57,16 +57,22 @@ var MockServer = Class.extend({
* 'field_view_get' call to the server. Calls processViews() of data_manager
* to mimick the real behavior of a call to loadViews().
*
- * @param {string|Object} arch a string OR a parsed xml document
- * @param {string} model a model name (that should be in this.data)
+ * @param {Object} params
+ * @param {string|Object} params.arch a string OR a parsed xml document
+ * @param {string} params.model a model name (that should be in this.data)
+ * @param {Object} params.toolbar the actions possible in the toolbar
+ * @param {Object} [params.viewOptions] the view options set in the test (optional)
* @returns {Object} an object with 2 keys: arch and fields
*/
- fieldsViewGet: function (arch, model, toolbar) {
+ fieldsViewGet: function (params) {
+ var model = params.model;
+ var toolbar = params.toolbar;
+ var viewOptions = params.viewOptions || {};
if (!(model in this.data)) {
throw new Error('Model ' + model + ' was not defined in mock server data');
}
var fields = $.extend(true, {}, this.data[model].fields);
- var fvg = this._fieldsViewGet(arch, model, fields);
+ var fvg = this._fieldsViewGet(params.arch, model, fields, viewOptions.context);
var fields_views = {};
fields_views[fvg.type] = fvg;
data_manager.processViews(fields_views, fields);
@@ -155,10 +161,11 @@ var MockServer = Class.extend({
* @param {string|Object} arch a string OR a parsed xml document
* @param {string} model a model name (that should be in this.data)
* @param {Object} fields
+ * @param {Object} context
* @returns {Object} an object with 2 keys: arch and fields (the fields
* appearing in the views)
*/
- _fieldsViewGet: function (arch, model, fields) {
+ _fieldsViewGet: function (arch, model, fields, context) {
var self = this;
var modifiersNames = ['invisible', 'readonly', 'required'];
var onchanges = this.data[model].onchanges || {};
@@ -224,7 +231,8 @@ var MockServer = Class.extend({
}
_.each(modifiersNames, function (a) {
if (node.attrs[a]) {
- var v = pyeval.py_eval(node.attrs[a]) ? true: false;
+ var pyevalContext = window.py.dict.fromJSON(context || {});
+ var v = pyeval.py_eval(node.attrs[a], {context: pyevalContext}) ? true: false;
if (inTreeView && a === 'invisible') {
modifiers['tree_invisible'] = v;
} else if (v || !(a in modifiers) || !_.isArray(modifiers[a])) {
@@ -252,7 +260,8 @@ var MockServer = Class.extend({
_.each(node.children, function (children) {
relModel = field.relation;
relFields = $.extend(true, {}, self.data[relModel].fields);
- field.views[children.tag] = self._fieldsViewGet(children, relModel, relFields);
+ field.views[children.tag] = self._fieldsViewGet(children, relModel,
+ relFields, context);
});
}
diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
index e2007106ecd..0939b0fc196 100644
--- a/addons/web/static/tests/helpers/test_utils.js
+++ b/addons/web/static/tests/helpers/test_utils.js
@@ -129,7 +129,7 @@ function createAsyncView(params) {
// add mock environment: mock server, session, fieldviewget, ...
var mockServer = addMockEnvironment(widget, params);
- var viewInfo = mockServer.fieldsViewGet(params.arch, params.model, params.toolbar);
+ var viewInfo = mockServer.fieldsViewGet(params);
// create the view
var viewOptions = {
@@ -321,10 +321,17 @@ function addMockEnvironment(widget, params) {
var view_type = view_descr[1];
var key = [model, view_id, view_type].join(',');
var arch = params.archs[key];
+ var viewParams = {
+ arch: arch,
+ model: model,
+ viewOptions: {
+ context: event.data.context.eval(),
+ },
+ };
if (!arch) {
throw new Error('No arch found for key ' + key);
}
- views[view_type] = mockServer.fieldsViewGet(arch, model);
+ views[view_type] = mockServer.fieldsViewGet(viewParams);
});
event.data.on_success(views);
diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js
index 9f9be3a4042..f1caba9ed4a 100644
--- a/addons/web/static/tests/views/calendar_tests.js
+++ b/addons/web/static/tests/views/calendar_tests.js
@@ -1257,6 +1257,37 @@ QUnit.module('Views', {
calendar.destroy();
$view.remove();
});
+
+ QUnit.test('set event as all day when field is date', function (assert) {
+ assert.expect(1);
+
+ this.data.event.records[0].start_date = "2016-12-14";
+
+ var calendar = createView({
+ View: CalendarView,
+ model: 'event',
+ data: this.data,
+ arch:
+ '