Merge PR #57 into 16.0

Signed-off-by simahawk
OCA · Jul 26, 2024 · eb4ef27 · eb4ef27
2 parents 8bf71b6 + 758f2c4
commit eb4ef27
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/endpoint/views/endpoint_view.xml b/endpoint/views/endpoint_view.xml
@@ -3,9 +3,10 @@
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 <odoo>
 
-    <record model="ir.ui.view" id="endpoint_endpoint_form_view">
-        <field name="name">endpoint.endpoint.form</field>
-        <field name="model">endpoint.endpoint</field>
+    <!-- Basic view inheritable by real models -->
+    <record model="ir.ui.view" id="endpoint_mixin_form_view">
+        <field name="name">endpoint.mixin.form</field>
+        <field name="model">endpoint.mixin</field>
         <field name="arch" type="xml">
             <form>
                 <header />
@@ -90,6 +91,19 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="endpoint_endpoint_form_view">
+        <field name="name">endpoint.endpoint.form</field>
+        <field name="model">endpoint.endpoint</field>
+        <field name="inherit_id" ref="endpoint.endpoint_mixin_form_view" />
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+          <form position="attributes">
+            <!-- Needed just to make further inheritance happy -->
+            <attribute name="name">real</attribute>
+          </form>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="endpoint_endpoint_search_view">
         <field name="name">endpoint.endpoint.search</field>
         <field name="model">endpoint.endpoint</field>

diff --git a/endpoint_auth_api_key/views/endpoint_view.xml b/endpoint_auth_api_key/views/endpoint_view.xml
@@ -3,9 +3,9 @@
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 <odoo>
 
-    <record model="ir.ui.view" id="endpoint_endpoint_form_view">
+    <record model="ir.ui.view" id="endpoint_mixin_form_view">
         <field name="model">endpoint.endpoint</field>
-        <field name="inherit_id" ref="endpoint.endpoint_endpoint_form_view" />
+        <field name="inherit_id" ref="endpoint.endpoint_mixin_form_view" />
         <field name="arch" type="xml">
             <group name="auth" position="inside">
                 <field