From 16b43d549a13effd81782d6c451d0a07662bca10 Mon Sep 17 00:00:00 2001
From: William Braeckman <wbr@odoo.com>
Date: Mon, 9 Dec 2024 15:10:22 +0100
Subject: [PATCH] [FIX] runbot: restore form views

Since https://github.com/odoo/odoo/pull/154710 form views can use
<chatter/> directly to include the chatter, not doing so completely
breaks the dom generated by the form view.
---
 runbot/views/build_error_views.xml | 17 +++--------------
 runbot/views/bundle_views.xml      |  7 ++-----
 runbot/views/codeowner_views.xml   |  5 +----
 runbot/views/config_views.xml      | 10 ++--------
 runbot/views/dashboard_views.xml   |  5 +----
 runbot/views/dockerfile_views.xml  | 10 ++--------
 runbot/views/host_views.xml        |  5 +----
 runbot/views/repo_views.xml        | 17 ++++-------------
 runbot/views/upgrade.xml           |  6 +-----
 9 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/runbot/views/build_error_views.xml b/runbot/views/build_error_views.xml
index 278d3eea..0c2d49ec 100644
--- a/runbot/views/build_error_views.xml
+++ b/runbot/views/build_error_views.xml
@@ -84,11 +84,7 @@
                 </page>
               </notebook>
           </sheet>
-          <div class="oe_chatter">
-              <field name="message_follower_ids"/>
-              <field name="message_ids"/>
-              <field name="activity_ids"/>
-          </div>
+          <chatter/>
         </form>
       </field>
     </record>
@@ -169,11 +165,7 @@
                   </page>
                 </notebook>
             </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids"/>
-                <field name="message_ids"/>
-                <field name="activity_ids"/>
-            </div>
+            <chatter/>
           </form>
         </field>
     </record>
@@ -379,10 +371,7 @@
                 <field name="replacement" invisible="re_type != 'cleaning'"/>
               </group>
             </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids"/>
-                <field name="message_ids"/>
-            </div>
+            <chatter/>
           </form>
         </field>
     </record>
diff --git a/runbot/views/bundle_views.xml b/runbot/views/bundle_views.xml
index 04a2f5f8..97e3de22 100644
--- a/runbot/views/bundle_views.xml
+++ b/runbot/views/bundle_views.xml
@@ -106,10 +106,7 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids"/>
-                    <field name="message_ids"/>
-                </div>
+                <chatter/>
             </form>
         </field>
     </record>
@@ -259,4 +256,4 @@
         <field name="view_mode">list,form</field>
     </record>
   </data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/runbot/views/codeowner_views.xml b/runbot/views/codeowner_views.xml
index c18509e8..afb81aae 100644
--- a/runbot/views/codeowner_views.xml
+++ b/runbot/views/codeowner_views.xml
@@ -15,10 +15,7 @@
                         <field name="version_domain" widget="domain" options="{'model': 'runbot.version', 'in_dialog': True, 'operators': ['in','=', '&lt;', '&gt;']}"/>
                     </group>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids"/>
-                    <field name="message_ids"/>
-                </div>
+                <chatter/>
             </form>
         </field>
     </record>
diff --git a/runbot/views/config_views.xml b/runbot/views/config_views.xml
index a7b05378..c857272c 100644
--- a/runbot/views/config_views.xml
+++ b/runbot/views/config_views.xml
@@ -22,10 +22,7 @@
                         <field name="group" groups="base.group_no_one"/>
                     </group>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids"/>
-                    <field name="message_ids"/>
-                </div>
+                <chatter/>
             </form>
         </field>
     </record>
@@ -129,10 +126,7 @@
                       </field>
                     </group>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids"/>
-                    <field name="message_ids"/>
-                </div>
+                <chatter/>
             </form>
         </field>
     </record>
diff --git a/runbot/views/dashboard_views.xml b/runbot/views/dashboard_views.xml
index 0ec713ef..99da6b88 100644
--- a/runbot/views/dashboard_views.xml
+++ b/runbot/views/dashboard_views.xml
@@ -49,10 +49,7 @@
                 </page>
               </notebook>
             </sheet>
-            <div class="oe_chatter">
-              <field name="message_follower_ids"/>
-              <field name="message_ids"/>
-          </div>
+            <chatter/>
           </form>
         </field>
     </record>
diff --git a/runbot/views/dockerfile_views.xml b/runbot/views/dockerfile_views.xml
index fc464b97..62de7ce9 100644
--- a/runbot/views/dockerfile_views.xml
+++ b/runbot/views/dockerfile_views.xml
@@ -88,10 +88,7 @@
                 </page>
               </notebook>
             </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids"/>
-                <field name="message_ids"/>
-            </div>
+            <chatter/>
           </form>
         </field>
     </record>
@@ -140,10 +137,7 @@
               <field name="rendered"/>
             </group>
           </sheet>
-          <div class="oe_chatter">
-              <field name="message_follower_ids"/>
-              <field name="message_ids"/>
-          </div>
+          <chatter/>
         </form>
       </field>
     </record>
diff --git a/runbot/views/host_views.xml b/runbot/views/host_views.xml
index 817a0fd6..0a9b4f37 100644
--- a/runbot/views/host_views.xml
+++ b/runbot/views/host_views.xml
@@ -39,10 +39,7 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids"/>
-                    <field name="message_ids"/>
-                </div>
+                <chatter/>
             </form>
         </field>
     </record>
diff --git a/runbot/views/repo_views.xml b/runbot/views/repo_views.xml
index 74792600..c1670d15 100644
--- a/runbot/views/repo_views.xml
+++ b/runbot/views/repo_views.xml
@@ -80,10 +80,7 @@
                 </list>
               </field>
             </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids"/>
-                <field name="message_ids"/>
-            </div>
+            <chatter/>
           </form>
         </field>
       </record>
@@ -199,10 +196,7 @@
                 </group>
               </group>
             </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids"/>
-                <field name="message_ids"/>
-            </div>
+            <chatter/>
           </form>
         </field>
     </record>
@@ -227,10 +221,7 @@
               </group>
             </sheet>
 
-            <div class="oe_chatter">
-                <field name="message_follower_ids"/>
-                <field name="message_ids"/>
-            </div>
+            <chatter/>
           </form>
         </field>
     </record>
@@ -291,4 +282,4 @@
     </record>
 
   </data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/runbot/views/upgrade.xml b/runbot/views/upgrade.xml
index ee06e54e..a9553ea2 100644
--- a/runbot/views/upgrade.xml
+++ b/runbot/views/upgrade.xml
@@ -44,11 +44,7 @@
                 <field name="message"/>
               </group>
             </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids" groups="base.group_user" options="{'post_refresh': 'recipients'}"/>
-                <field name="activity_ids"/>
-                <field name="message_ids"/>
-            </div>
+            <chatter/>
           </form>
       </field>
   </record>