From eae26763a9a59fbf7cdde4ee631a59075ac6999a Mon Sep 17 00:00:00 2001
From: AEstLo <palestebanez1@hotmail.com>
Date: Thu, 6 Aug 2026 16:48:34 +0200
Subject: [PATCH] [FIX] mail_activity_team  - adaptions to fix the layout
 according to
 https://github.com/odoo/odoo/commit/020a57bc509a49189fb3c3abe47dbe0edbfbdd5b

---
 mail_activity_team/__manifest__.py            |  2 +-
 mail_activity_team/models/mail_activity.py    |  5 ++++
 mail_activity_team/readme/CONTRIBUTORS.md     |  2 ++
 .../core/common/activity_model_patch.esm.js   | 11 +++++++
 .../common/mail_activity_team_model.esm.js    |  9 ++++++
 .../static/src/core/web/activity.xml          | 30 ++-----------------
 6 files changed, 31 insertions(+), 28 deletions(-)
 create mode 100644 mail_activity_team/static/src/core/common/activity_model_patch.esm.js
 create mode 100644 mail_activity_team/static/src/core/common/mail_activity_team_model.esm.js

diff --git a/mail_activity_team/__manifest__.py b/mail_activity_team/__manifest__.py
index 9b10e5835..6520b132c 100644
--- a/mail_activity_team/__manifest__.py
+++ b/mail_activity_team/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Mail Activity Team",
     "summary": "Add Teams to Activities",
-    "version": "19.0.1.0.0",
+    "version": "19.0.1.0.1",
     "development_status": "Beta",
     "category": "Social Network",
     "website": "https://github.com/OCA/mail",
diff --git a/mail_activity_team/models/mail_activity.py b/mail_activity_team/models/mail_activity.py
index c2e864461..78cf74bd5 100644
--- a/mail_activity_team/models/mail_activity.py
+++ b/mail_activity_team/models/mail_activity.py
@@ -4,6 +4,8 @@
 from odoo import SUPERUSER_ID, api, fields, models
 from odoo.exceptions import ValidationError
 
+from odoo.addons.mail.tools.discuss import Store
+
 
 class MailActivity(models.Model):
     _inherit = "mail.activity"
@@ -130,3 +132,6 @@ def _onchange_activity_type_id(self):
             if self.user_id not in members and members:
                 self.user_id = members[:1]
         return res
+
+    def _to_store_defaults(self, target):
+        return super()._to_store_defaults(target) + [Store.One("team_id", ["name"])]
diff --git a/mail_activity_team/readme/CONTRIBUTORS.md b/mail_activity_team/readme/CONTRIBUTORS.md
index b1d175340..22f61d3ab 100644
--- a/mail_activity_team/readme/CONTRIBUTORS.md
+++ b/mail_activity_team/readme/CONTRIBUTORS.md
@@ -15,3 +15,5 @@
 - [CorporateHub](https://corporatehub.eu/)
   - Alexey Pelykh <alexey.pelykh@corphub.eu>
 - Stefan Rijnhart (<stefan@opener.amsterdam>)
+- [Digiteasy](https://www.digiteasy.at/)
+  - Alvaro Estebanez
diff --git a/mail_activity_team/static/src/core/common/activity_model_patch.esm.js b/mail_activity_team/static/src/core/common/activity_model_patch.esm.js
new file mode 100644
index 000000000..63b0f5dc1
--- /dev/null
+++ b/mail_activity_team/static/src/core/common/activity_model_patch.esm.js
@@ -0,0 +1,11 @@
+import {Activity} from "@mail/core/common/activity_model";
+import {fields} from "@mail/core/common/record";
+
+import {patch} from "@web/core/utils/patch";
+
+patch(Activity.prototype, {
+    setup() {
+        super.setup(...arguments);
+        this.team_id = fields.One("mail.activity.team");
+    },
+});
diff --git a/mail_activity_team/static/src/core/common/mail_activity_team_model.esm.js b/mail_activity_team/static/src/core/common/mail_activity_team_model.esm.js
new file mode 100644
index 000000000..e5ff64702
--- /dev/null
+++ b/mail_activity_team/static/src/core/common/mail_activity_team_model.esm.js
@@ -0,0 +1,9 @@
+import {Record} from "@mail/core/common/record";
+
+export class MailActivityTeam extends Record {
+    static _name = "mail.activity.team";
+    /** @type {String} */
+    name;
+}
+
+MailActivityTeam.register();
diff --git a/mail_activity_team/static/src/core/web/activity.xml b/mail_activity_team/static/src/core/web/activity.xml
index 50455e416..cb1475d6a 100644
--- a/mail_activity_team/static/src/core/web/activity.xml
+++ b/mail_activity_team/static/src/core/web/activity.xml
@@ -6,20 +6,6 @@
         t-inherit="mail.Activity"
         t-inherit-mode="extension"
     >
-        <!-- Prevent error rendering the avatar in case of missing user -->
-        <xpath
-            expr="//div/div[hasclass('o-mail-Activity-sidebar')]/a/img"
-            position="attributes"
-        >
-            <attribute name="t-if">props.activity.user_id</attribute>
-        </xpath>
-        <!-- Prevent error rendering the assigned user in case of missing user -->
-        <xpath
-            expr="//div/div/div[hasclass('o-mail-Activity-info')]/span[hasclass('o-mail-Activity-user')]"
-            position="attributes"
-        >
-            <attribute name="t-if">props.activity.user_id</attribute>
-        </xpath>
         <!-- Show team in the condensed view -->
         <xpath
             expr="//div/div/div[hasclass('o-mail-Activity-info')]/span[hasclass('o-mail-Activity-user')]"
@@ -28,25 +14,15 @@
             <span
                 class="o-mail-Activity-user px-1"
                 t-if="props.activity.team_id"
-            >(Team <t t-esc="props.activity.team_id[1]" />)
+            >(Team <t t-esc="props.activity.team_id.name" />)
             </span>
         </xpath>
-        <!-- Prevent error rendering the assigned user in case of missing user in the expanded view -->
-        <xpath
-            expr="//t[@t-esc='props.activity.persona.name']/parent::td/parent::tr"
-            position="attributes"
-        >
-            <attribute name="t-if">props.activity.user_id</attribute>
-        </xpath>
         <!-- Show team in the expanded view -->
-        <xpath
-            expr="//t[@t-esc='props.activity.persona.name']/parent::td/parent::tr"
-            position="after"
-        >
+        <xpath expr="//tr[@t-if='props.activity.user_id']" position="after">
             <tr t-if="props.activity.team_id">
                 <td class="text-end fw-bolder">Team</td>
                 <td>
-                    <t t-esc="props.activity.team_id[1]" />
+                    <t t-esc="props.activity.team_id.name" />
                 </td>
             </tr>
         </xpath>