Add attributes and elements on XML views' checks to avoid errors with…

… Studio (renamed_field and studio_groups)
odoo · Sep 21, 2017 · 45aabaa · 45aabaa
1 parent c6b184b
commit 45aabaa
Show file tree

Hide file tree

Showing 8 changed files with 150 additions and 108 deletions.
diff --git a/odoo/addons/base/rng/calendar_view.rng b/odoo/addons/base/rng/calendar_view.rng
@@ -30,6 +30,7 @@
             </rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
+                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
             <rng:optional>
                 <rng:element name="template">

diff --git a/odoo/addons/base/rng/common.rng b/odoo/addons/base/rng/common.rng
diff --git a/odoo/addons/base/rng/diagram_view.rng b/odoo/addons/base/rng/diagram_view.rng
@@ -14,6 +14,7 @@
             <rng:ref name="arrow"/>
             <rng:zeroOrMore>
                 <rng:ref name="label"/>
+                <rng:ref name="renamed_label"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
@@ -26,6 +27,7 @@
             <rng:optional><rng:attribute name="form_view_ref"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
+                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>
@@ -39,6 +41,7 @@
             <rng:optional><rng:attribute name="label"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
+                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>

diff --git a/odoo/addons/base/rng/graph_view.rng b/odoo/addons/base/rng/graph_view.rng
@@ -24,6 +24,7 @@
             <rng:optional><rng:attribute name="interval"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
+                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>

diff --git a/odoo/addons/base/rng/pivot_view.rng b/odoo/addons/base/rng/pivot_view.rng
@@ -14,6 +14,7 @@
             <rng:optional><rng:attribute name="disable_linking"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
+                <rng:ref name="renamed_field"/>
             </rng:zeroOrMore>
         </rng:element>
     </rng:define>

diff --git a/odoo/addons/base/rng/search_view.rng b/odoo/addons/base/rng/search_view.rng
@@ -13,6 +13,7 @@
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field"/>
+                    <rng:ref name="renamed_field"/>
                     <rng:ref name="group"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="filter"/>

diff --git a/odoo/addons/base/rng/tree_view.rng b/odoo/addons/base/rng/tree_view.rng
@@ -53,6 +53,7 @@
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field"/>
+                    <rng:ref name="renamed_field"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="tree"/>
                     <rng:ref name="group"/>

diff --git a/odoo/tools/view_validation.py b/odoo/tools/view_validation.py
@@ -75,7 +75,7 @@ def valid_field_in_graph(arch):
 def valid_field_in_tree(arch):
     """ Children of ``tree`` view must be ``field`` or ``button``."""
     return all(
-        child.tag in ('field', 'button')
+        child.tag in ('field', 'button', 'renamed_field')
         for child in arch.xpath('/tree/*')
     )