+
0 Late
diff --git a/addons/mail/static/tests/systray_tests.js b/addons/mail/static/tests/systray_tests.js
index c27a2978fb0..b30b5e7b279 100644
--- a/addons/mail/static/tests/systray_tests.js
+++ b/addons/mail/static/tests/systray_tests.js
@@ -20,6 +20,7 @@ QUnit.module('ActivityMenu', {
fields: {
name: { type: "char" },
model: { type: "char" },
+ type: { type: "char" },
planned_count: { type: "integer"},
today_count: { type: "integer"},
overdue_count: { type: "integer"},
@@ -28,6 +29,7 @@ QUnit.module('ActivityMenu', {
records: [{
name: "Contact",
model: "res.partner",
+ type: "activity",
planned_count: 0,
today_count: 1,
overdue_count: 0,
@@ -35,6 +37,7 @@ QUnit.module('ActivityMenu', {
},
{
name: "Task",
+ type: "activity",
model: "project.task",
planned_count: 1,
today_count: 0,
@@ -43,6 +46,7 @@ QUnit.module('ActivityMenu', {
},
{
name: "Issue",
+ type: "activity",
model: "project.issue",
planned_count: 1,
today_count: 1,
diff --git a/addons/note/models/res_users.py b/addons/note/models/res_users.py
index 6f248c47664..d1bca02e65c 100644
--- a/addons/note/models/res_users.py
+++ b/addons/note/models/res_users.py
@@ -63,6 +63,7 @@ GROUP BY id"""
activities[note_index]['name'] = note_label
else:
activities.append({
+ 'type': 'activity',
'name': note_label,
'model': 'note.note',
'icon': modules.module.get_module_icon(self.env['note.note']._original_module),
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 6c12d508937..c770c9eb642 100644
--- a/addons/web/static/src/js/views/calendar/calendar_view.js
+++ b/addons/web/static/src/js/views/calendar/calendar_view.js
@@ -152,7 +152,7 @@ var CalendarView = AbstractView.extend({
this.loadParams.fieldColor = attrs.color;
this.loadParams.filters = filters;
- this.loadParams.mode = attrs.mode;
+ this.loadParams.mode = (params.context && params.context.default_mode) || attrs.mode;
this.loadParams.initialDate = moment(params.initialDate || new Date());
},
});