audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

update common

Browse Source
This commit is contained in:
ivan deng
2021-01-22 18:58:53 +08:00
parent b8ae3fde85
commit fe3c51fae9
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app_common/__manifest__.py
View File

@@ -33,7 +33,7 @@
{
'name': "Sunpop Odooapp Common Func",
'version': '13.20.10.15',
'version': '13.21.01.20',
'author': 'Sunpop.cn',
'category': 'Base',
'website': 'https://www.sunpop.cn',

6
app_common/models/ir_ui_view.py
View File

@@ -21,9 +21,9 @@ def app_valid_field_in_tree(arch, **kwargs):
def app_relaxng(view_type):
""" Return a validator for the given view type, or None. """
if view_type not in _relaxng_cache:
# tree 特殊
if view_type == 'tree':
_file = get_resource_path('app_common', 'rng', 'tree_view.rng')
# tree, search 特殊
if view_type in ['tree', 'search']:
_file = get_resource_path('app_common', 'rng', '%s_view.rng' % view_type)
else:
_file = get_resource_path('base', 'rng', '%s_view.rng' % view_type)
with tools.file_open(_file) as frng:

15
app_common/rng/search_view.rng
View File

@@ -12,6 +12,19 @@
<rng:ref name="overload"/>
<rng:optional><rng:attribute name="view_types"/></rng:optional>
<rng:optional><rng:attribute name="class"/></rng:optional>
<rng:optional><rng:attribute name="options"/></rng:optional>
<rng:zeroOrMore>
<rng:ref name="field" />
</rng:zeroOrMore>
</rng:element>
</rng:define>
<rng:define name="superbar">
<rng:element name="superbar">
<rng:ref name="overload"/>
<rng:optional><rng:attribute name="view_types"/></rng:optional>
<rng:optional><rng:attribute name="class"/></rng:optional>
<rng:optional><rng:attribute name="options"/></rng:optional>
<rng:zeroOrMore>
<rng:ref name="field" />
</rng:zeroOrMore>
@@ -29,7 +42,9 @@
<rng:ref name="separator"/>
<rng:ref name="filter"/>
<rng:element name="newline"><rng:empty/></rng:element>
<rng:optional><rng:attribute name="options"/></rng:optional>
<rng:ref name="searchpanel"/>
<rng:ref name="superbar"/>
</rng:choice>
</rng:zeroOrMore>
</rng:element>