From bbf3dedb7a1466eb1d97c33a1d3adef15bb21da2 Mon Sep 17 00:00:00 2001
From: "Viktors Lipskis (vili)" <vili@odoo.com>
Date: Mon, 5 Sep 2022 13:04:07 +0000
Subject: [PATCH] [FIX] mail: fix activity Mark as Done panels

Clicking on kanban activity Mark as Done button now works as expected, either displaying one empty panel or displaying no panels at all.
Before this commit, repeating a click on the button did not reset the panel, so the next click added another form to the panel.
Also, clicking on the button left other panels open.

task-2961943

closes odoo/odoo#98832

Signed-off-by: Arnaud Joset <arj@odoo.com>
---
 addons/mail/static/src/js/activity.js              | 3 +++
 addons/mail/static/src/xml/web_kanban_activity.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index 8f71065ebe2..9388f124817 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -189,10 +189,12 @@ const KanbanActivity = AbstractField.extend({
                     if ($(el).data('bs.collapse')) {
                         $(el).empty().collapse('dispose').removeClass('show');
                     }
+                    $(el).data('bs.collapse', false);
                 });
 
                 // Scroll  to selected activity
                 $markDoneBtn.parents('.o_activity_log_container').scrollTo($actLi.position().top, 100);
+                $panel.data('bs.collapse', true);
             }
 
             // Empty and reset panel on close
@@ -202,6 +204,7 @@ const KanbanActivity = AbstractField.extend({
                     $panel.collapse('dispose');
                     $panel.empty();
                 }
+                $panel.data('bs.collapse', false);
             });
 
             this.$('.o_activity_selected').removeClass('o_activity_selected');
diff --git a/addons/mail/static/src/xml/web_kanban_activity.xml b/addons/mail/static/src/xml/web_kanban_activity.xml
index 2928e0041c0..4ab6f815766 100644
--- a/addons/mail/static/src/xml/web_kanban_activity.xml
+++ b/addons/mail/static/src/xml/web_kanban_activity.xml
@@ -46,7 +46,7 @@
                     <t class="activities_list_group_item">
                         <t t-call="mail.activities-list-group-item"/>
                     </t>
-                    <li t-attf-id="o_activity_form_{{log.id}}" class="o_activity_form list-group-item border-top-0 py-0 mb-2 collapse"></li>
+                    <li t-attf-id="o_activity_form_{{log.id}}" class="o_activity_form list-group-item border-top-0 py-0 mb-2 collapse" data-bs-collapse="false"></li>
                 </t>
             </t>
         </ul>