diff --git a/mail_activity_board/__manifest__.py b/mail_activity_board/__manifest__.py
index 9b0a708aad..f250f86902 100644
--- a/mail_activity_board/__manifest__.py
+++ b/mail_activity_board/__manifest__.py
@@ -4,20 +4,18 @@
{
"name": "Mail Activity Board",
"summary": "Add Activity Boards",
- "version": "15.0.1.1.1",
+ "version": "16.0.1.0.0",
"development_status": "Beta",
"category": "Social Network",
"website": "https://github.com/OCA/social",
"author": "SDi, David Juaneda, Sodexis, ACSONE SA/NV, Odoo Community Association (OCA)",
"license": "AGPL-3",
"installable": True,
- "depends": ["calendar", "board"],
+ "depends": ["calendar", "spreadsheet_dashboard"],
"data": ["views/mail_activity_view.xml"],
"assets": {
"web.assets_backend": [
"mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js",
- ],
- "web.assets_qweb": [
"mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.xml",
],
},
diff --git a/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js b/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js
index 253eea1c10..6dce776a92 100644
--- a/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js
+++ b/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js
@@ -1,6 +1,7 @@
/** @odoo-module **/
-import {patch} from "web.utils";
import {ChatterTopbar} from "@mail/components/chatter_topbar/chatter_topbar";
+import {bus} from "web.core";
+import {patch} from "@web/core/utils/patch";
const components = {ChatterTopbar};
// Import {rpc}
import rpc from "web.rpc";
@@ -18,24 +19,23 @@ patch(
* @param {MouseEvent} ev
*/
// eslint-disable-next-line no-unused-vars
- _onListActivity(ev) {
- var self = this;
+ async _onListActivity(ev) {
rpc.query({
- model: this.chatter.thread.model,
+ model: this.chatterTopbar.chatter.thread.model,
method: "redirect_to_activities",
args: [[]],
kwargs: {
- id: this.chatter.thread.id,
- model: this.chatter.thread.model,
+ id: this.chatterTopbar.chatter.thread.id,
+ model: this.chatterTopbar.chatter.thread.model,
},
context: {},
}).then(function (action) {
- self.env.bus.trigger("do-action", {
+ bus.trigger("do-action", {
action,
options: {
on_close: () => {
- this.chatter.thread.refreshActivities();
- this.chatter.thread.refresh();
+ this.chatterTopbar.chatter.thread.refreshActivities();
+ this.chatterTopbar.chatter.thread.refresh();
},
},
});
diff --git a/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.xml b/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.xml
index 2cc61b5ebb..4f176c4809 100644
--- a/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.xml
+++ b/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.xml
@@ -1,19 +1,20 @@
-
-
-
-
+ View Activities
+
+
-
diff --git a/mail_activity_board/tests/test_mail_activity_board.py b/mail_activity_board/tests/test_mail_activity_board.py
index f83d971a35..d268bf2c84 100644
--- a/mail_activity_board/tests/test_mail_activity_board.py
+++ b/mail_activity_board/tests/test_mail_activity_board.py
@@ -143,8 +143,8 @@ def create_mail_activity_group(self):
def get_view(self, activity):
action = activity.open_origin()
- result = self.env[action.get("res_model")].load_views(action.get("views"))
- return result.get("fields_views").get(action.get("view_mode"))
+ result = self.env[action.get("res_model")].get_views(action.get("views"))
+ return result.get("views").get(action.get("view_mode"))
def test_open_origin_res_partner(self):
"""This test case checks
@@ -159,19 +159,19 @@ def test_open_origin_res_partner(self):
view = self.get_view(self.act1)
# Check the next view is correct
- self.assertEqual(form_view_partner_id, view.get("view_id"))
+ self.assertEqual(form_view_partner_id, view.get("id"))
# Id of the form view return open_origin()
view = self.get_view(self.act2)
# Check the next view is correct
- self.assertEqual(form_view_partner_id, view.get("view_id"))
+ self.assertEqual(form_view_partner_id, view.get("id"))
# Id of the form view return open_origin()
view = self.get_view(self.act3)
# Check the next view is correct
- self.assertEqual(form_view_partner_id, view.get("view_id"))
+ self.assertEqual(form_view_partner_id, view.get("id"))
def test_redirect_to_activities(self):
"""This test case checks
@@ -180,15 +180,19 @@ def test_redirect_to_activities(self):
"""
action_id = self.env.ref("mail_activity_board.open_boards_activities").id
action = self.partner_client.redirect_to_activities(
- **{"id": self.partner_client.id}
+ **{
+ "id": self.partner_client.id,
+ "model": self.partner_client._name,
+ }
)
self.assertEqual(action.get("id"), action_id)
kwargs = {"groupby": ["activity_type_id"]}
kwargs["domain"] = action.get("domain")
- result = self.env[action.get("res_model")].load_views(action.get("views"))
- fields = result.get("fields_views").get("kanban").get("fields")
+ result = self.env[action.get("res_model")].get_views(action.get("views"))
+ # fields = result.get("views").get("kanban").get("fields")
+ fields = result.get("models").get(action.get("res_model"))
kwargs["fields"] = list(fields.keys())
result = self.env["mail.activity"].read_group(**kwargs)
diff --git a/mail_activity_board/views/mail_activity_view.xml b/mail_activity_board/views/mail_activity_view.xml
index 9c3f365e6d..1de6b542ac 100644
--- a/mail_activity_board/views/mail_activity_view.xml
+++ b/mail_activity_board/views/mail_activity_view.xml
@@ -196,17 +196,13 @@
t-if="record.activity_category.raw_value!='meeting'"
>
-
+
@@ -220,17 +216,11 @@
t-if="record.activity_category.raw_value!='meeting'"
>
-
+
-
+
@@ -329,7 +319,7 @@ Menus