diff --git a/addons/web/static/src/js/views/calendar/calendar_view.js b/addons/web/static/src/js/views/calendar/calendar_view.js index c770c9eb642..20d358c517c 100644 --- a/addons/web/static/src/js/views/calendar/calendar_view.js +++ b/addons/web/static/src/js/views/calendar/calendar_view.js @@ -125,10 +125,10 @@ var CalendarView = AbstractView.extend({ attrs.form_view_id ? parseInt(attrs.form_view_id, 10) : false; if (!this.controllerParams.formViewId && params.action) { var formViewDescr = _.find(params.action.views, function (v) { - return v[1] === 'form'; + return v.type === 'form'; }); if (formViewDescr) { - this.controllerParams.formViewId = formViewDescr[0]; + this.controllerParams.formViewId = formViewDescr.viewID; } } diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js index 9614350a9f8..54ecdbe07e7 100644 --- a/addons/web/static/tests/views/calendar_tests.js +++ b/addons/web/static/tests/views/calendar_tests.js @@ -2248,7 +2248,7 @@ QUnit.module('Views', { archs: archs, viewOptions: { initialDate: initialDate, - action: {views: [[1, 'kanban'], [43, 'form']]} + action: {views: [{viewID: 1, type: 'kanban'}, {viewID: 43, type: 'form'}]} }, mockRPC: function (route, args) { if (args.method === "create") {