tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

New search widget

Browse Source 
- Change select on fields into Boolean
- Change format of search_value on ir.action.act_window

review95002
This commit is contained in:
Cédric Krier
2011-10-03 09:45:21 +02:00
parent 0f025ba79d
commit cc48eb8532
40 changed files with 179 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+2
View File
@@ -1,3 +1,5 @@
* Change select on fields into Boolean
* Change format of search_value on ir.action.act_window
* Manage relation field access
* Support size format in context for Binary fields
* Use buffer for Binary fields
doc/ref/models/fields.rst
+1 -3
View File
@@ -77,9 +77,7 @@ If true, the field can be used as condition for a custom default value.
.. attribute:: Field.select
When equal to ``1``, the field appears in the search box in list view and the
search will be optimized. When equal to ``2`` the field appears in the
*Advanced Search* in the search box.
If true, the content of the field will be indexed.
``on_change``
-------------
doc/topics/modules/index.rst
+7 -7
View File
@@ -123,13 +123,13 @@ The following snippet gives a first idea of what an xml file looks:
<field name="arch" type="xml">
<![CDATA[
<tree string="Parties">
<field name="code" select="1"/>
<field name="name" select="1"/>
<field name="lang" select="2"/>
<field name="vat_code" select="1"/>
<field name="active" select="2" tree_invisible="1"/>
<field name="vat_country" select="2" tree_invisible="1"/>
<field name="vat_number" select="2" tree_invisible="1"/>
<field name="code"/>
<field name="name"/>
<field name="lang"/>
<field name="vat_code"/>
<field name="active" tree_invisible="1"/>
<field name="vat_country" tree_invisible="1"/>
<field name="vat_number" tree_invisible="1"/>
</tree>
]]>
</field>
doc/topics/views/index.rst
+4 -9
View File
@@ -464,11 +464,6 @@ field
* ``widget``: The widget that must be used instead of the default one.
* ``select``: A number between 0 and 2. If set to 1, the field will be used
as main search criteria; if set to 2, the field will be used as second
search criteria; if set to 0, the field will not be used as search
criteria.
* ``tree_invisible``: Boolean to display or not the column.
* ``icon``: The name of the field that contains the name of the icon to
@@ -487,10 +482,10 @@ Example
::
<tree string="Taxes" sequence="sequence">
<field name="name" select="1"/>
<field name="group" select="1"/>
<field name="type" select="1"/>
<field name="active" select="2"/>
<field name="name"/>
<field name="group"/>
<field name="type"/>
<field name="active"/>
<field name="sequence" tree_invisible="1"/>
</tree>
trytond/ir/action.py
+17 -22
View File
@@ -521,15 +521,23 @@ class ActionActWindow(ModelSQL, ModelView):
('check_views', 'invalid_views'),
('check_domain', 'invalid_domain'),
('check_context', 'invalid_context'),
('check_search_value', 'invalid_search_value'),
]
self._error_messages.update({
'invalid_views': 'Invalid views!',
'invalid_domain': 'Invalid domain!',
'invalid_domain': 'Invalid domain or search criteria!',
'invalid_context': 'Invalid context!',
'invalid_search_value': 'Invalid search criteria!',
})
def init(self, module_name):
cursor = Transaction().cursor
super(ActionActWindow, self).init(module_name)
# Migration from 2.0: new search_value format
cursor.execute('UPDATE "%s" '
'SET search_value = %%s '
'WHERE search_value = %%s' % self._table,
('[]', '{}'))
def default_type(self):
return 'ir.action.act_window'
@@ -549,7 +557,7 @@ class ActionActWindow(ModelSQL, ModelView):
return True
def default_search_value(self):
return '{}'
return '[]'
def check_views(self, ids):
"Check views"
@@ -571,11 +579,13 @@ class ActionActWindow(ModelSQL, ModelView):
return True
def check_domain(self, ids):
"Check domain"
"Check domain and search_value"
for action in self.browse(ids):
if action.domain:
for domain in (action.domain, action.search_value):
if not domain:
continue
try:
value = safe_eval(action.domain, CONTEXT)
value = safe_eval(domain, CONTEXT)
except Exception:
return False
if isinstance(value, PYSON):
@@ -610,21 +620,6 @@ class ActionActWindow(ModelSQL, ModelView):
return False
return True
def check_search_value(self, ids):
"Check search_value"
for action in self.browse(ids):
if action.search_value:
try:
value = safe_eval(action.search_value, CONTEXT)
except Exception:
return False
if isinstance(value, PYSON):
if not value.types() == set([dict]):
return False
elif not isinstance(value, dict):
return False
return True
def get_views(self, ids, name):
res = {}
for act in self.browse(ids):
trytond/ir/action.xml
+11 -11
View File
@@ -46,8 +46,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Action">
<field name="name" select="1"/>
<field name="type" select="1"/>
<field name="name"/>
<field name="type"/>
</tree>
]]>
</field>
@@ -133,10 +133,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Report xml">
<field name="name" select="1"/>
<field name="name"/>
<field name="type"/>
<field name="model" select="1"/>
<field name="report_name" select="2"/>
<field name="model"/>
<field name="report_name"/>
</tree>
]]>
</field>
@@ -231,8 +231,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Open Window">
<field name="name" select="1"/>
<field name="res_model" select="1"/>
<field name="name"/>
<field name="res_model"/>
<field name="domain"/>
</tree>
]]>
@@ -306,9 +306,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Wizard">
<field name="name" select="1"/>
<field name="name"/>
<field name="type"/>
<field name="wiz_name" select="1"/>
<field name="wiz_name"/>
</tree>
]]>
</field>
@@ -377,9 +377,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="URL">
<field name="name" select="1"/>
<field name="name"/>
<field name="type"/>
<field name="url" select="1"/>
<field name="url"/>
</tree>
]]>
</field>
trytond/ir/attachment.xml
+2 -2
View File
@@ -44,8 +44,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Attachments" fill="1">
<field name="resource" select="1"/>
<field name="name" select="1"/>
<field name="resource"/>
<field name="name"/>
<field name="data_size"/>
<field name="summary"/>
<field name="last_user"/>
trytond/ir/cron.xml
+5 -5
View File
@@ -13,13 +13,13 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<tree string="Scheduled Actions">
<field name="next_call"/>
<field name="name" select="1"/>
<field name="user" select="1"/>
<field name="request_user" select="2"/>
<field name="name"/>
<field name="user"/>
<field name="request_user"/>
<field name="interval_number"/>
<field name="interval_type"/>
<field name="number_calls" select="2"/>
<field name="active" select="2"/>
<field name="number_calls"/>
<field name="active"/>
</tree>
]]>
</field>
trytond/ir/export.xml
+2 -2
View File
@@ -24,8 +24,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Exports">
<field name="name" select="1"/>
<field name="resource" select="1"/>
<field name="name"/>
<field name="resource"/>
</tree>
]]>
</field>
trytond/ir/lang.xml
+4 -4
View File
@@ -79,11 +79,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Languages" editable="bottom">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="name"/>
<field name="code"/>
<field name="direction"/>
<field name="translatable" select="1"/>
<field name="active" select="2"/>
<field name="translatable"/>
<field name="active"/>
</tree>
]]>
</field>
trytond/ir/model.xml
+19 -19
View File
@@ -43,10 +43,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Model Description">
<field name="name" select="1"/>
<field name="model" select="1"/>
<field name="info" select="2"/>
<field name="module" select="1"/>
<field name="name"/>
<field name="model"/>
<field name="info"/>
<field name="module"/>
</tree>
]]>
</field>
@@ -99,11 +99,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Fields">
<field name="name" select="1"/>
<field name="model" select="1"/>
<field name="ttype" select="2"/>
<field name="relation" select="2"/>
<field name="field_description" select="2"/>
<field name="name"/>
<field name="model"/>
<field name="ttype"/>
<field name="relation"/>
<field name="field_description"/>
<field name="module"/>
</tree>
]]>
@@ -133,12 +133,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Access controls">
<field name="perm_read" select="2"/>
<field name="perm_write" select="2"/>
<field name="perm_create" select="2"/>
<field name="perm_delete" select="2"/>
<field name="model" select="1"/>
<field name="group" select="1"/>
<field name="perm_read"/>
<field name="perm_write"/>
<field name="perm_create"/>
<field name="perm_delete"/>
<field name="model"/>
<field name="group"/>
</tree>
]]>
</field>
@@ -193,10 +193,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Field Access">
<field name="perm_read" select="2"/>
<field name="perm_write" select="2"/>
<field name="field" select="1"/>
<field name="group" select="1"/>
<field name="perm_read"/>
<field name="perm_write"/>
<field name="field"/>
<field name="group"/>
</tree>
]]>
</field>
trytond/ir/module/module.xml
+8 -8
View File
@@ -61,13 +61,13 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<tree string="Modules" on_write="on_write"
colors="If(In(Eval('state', ''), ['to upgrade', 'to install']), 'blue', If(Equal(Eval('state', ''), 'uninstalled'), 'grey', 'black'))">
<field name="name" select="1"/>
<field name="shortdesc" select="1"/>
<field name="author" select="2"/>
<field name="name"/>
<field name="shortdesc"/>
<field name="author"/>
<field name="version"/>
<field name="website" select="2"/>
<field name="state" select="1"/>
<field name="description" tree_invisible="1" select="2"/>
<field name="website"/>
<field name="state"/>
<field name="description" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -99,9 +99,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Config Wizard Items" editable="bottom">
<field name="name" select="1"/>
<field name="name"/>
<field name="sequence"/>
<field name="state" select="1"/>
<field name="state"/>
</tree>
]]>
</field>
trytond/ir/property.xml
+4 -4
View File
@@ -27,10 +27,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Properties">
<field name="name" select="1"/>
<field name="field" select="1"/>
<field name="value" select="2"/>
<field name="res" select="2"/>
<field name="name"/>
<field name="field"/>
<field name="value"/>
<field name="res"/>
</tree>
]]>
</field>
trytond/ir/rule.xml
+8 -8
View File
@@ -42,14 +42,14 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Record rules">
<field name="perm_read" select="2"/>
<field name="perm_write" select="2"/>
<field name="perm_create" select="2"/>
<field name="perm_delete" select="2"/>
<field name="model" select="1"/>
<field name="name" select="2"/>
<field name="global_p" select="1"/>
<field name="default_p" select="1"/>
<field name="perm_read"/>
<field name="perm_write"/>
<field name="perm_create"/>
<field name="perm_delete"/>
<field name="model"/>
<field name="name"/>
<field name="global_p"/>
<field name="default_p"/>
</tree>
]]>
</field>
trytond/ir/sequence.xml
+5 -5
View File
@@ -59,10 +59,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Sequences">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="type" select="1"/>
<field name="active" select="2"/>
<field name="name"/>
<field name="code"/>
<field name="type"/>
<field name="active"/>
</tree>
]]>
</field>
@@ -147,7 +147,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Sequence Type">
<field name="name" select="1"/>
<field name="name"/>
<field name="code"/>
</tree>
]]>
trytond/ir/translation.xml
+8 -8
View File
@@ -37,14 +37,14 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Translations" editable="bottom">
<field name="src" select="1"/>
<field name="value" select="2"/>
<field name="fuzzy" select="1"/>
<field name="name" select="2"/>
<field name="lang" select="1"/>
<field name="type" select="2"/>
<field name="res_id" select="2"/>
<field name="module" select="2"/>
<field name="src"/>
<field name="value"/>
<field name="fuzzy"/>
<field name="name"/>
<field name="lang"/>
<field name="type"/>
<field name="res_id"/>
<field name="module"/>
</tree>
]]>
</field>
trytond/ir/trigger.xml
+7 -7
View File
@@ -45,13 +45,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Triggers">
<field name="name" select="1"/>
<field name="model" select="1"/>
<field name="on_time" select="2"/>
<field name="on_create" select="2"/>
<field name="on_write" select="2"/>
<field name="on_delete" select="2"/>
<field name="active" select="2"/>
<field name="name"/>
<field name="model"/>
<field name="on_time"/>
<field name="on_create"/>
<field name="on_write"/>
<field name="on_delete"/>
<field name="active"/>
</tree>
]]>
</field>
trytond/ir/ui/form.rnc
-2
View File
@@ -114,8 +114,6 @@ attlist.field &= attribute sum { text }?
attlist.field &= attribute key { text }?
attlist.field &= attribute domain { text }?
attlist.field &= attribute color { text }?
attlist.field &=
[ a:defaultValue = "0" ] attribute select { "0" | "1" | "2" }?
attlist.field &=
[ a:defaultValue = "left_to_right" ] attribute orientation {
"left_to_right"
trytond/ir/ui/form.rng
-11
View File
@@ -424,17 +424,6 @@
<attribute name="color"/>
</optional>
</define>
<define name="attlist.field" combine="interleave">
<optional>
<attribute name="select" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
<value>2</value>
</choice>
</attribute>
</optional>
</define>
<define name="attlist.field" combine="interleave">
<optional>
<attribute name="orientation" a:defaultValue="left_to_right">
trytond/ir/ui/icon.xml
+3 -3
View File
@@ -9,9 +9,9 @@
<field name="arch" type="xml">
<![CDATA[
<tree string="Icons" sequence="sequence">
<field name="name" select="1" icon="name"/>
<field name="module" select="1"/>
<field name="path" select="2"/>
<field name="name" icon="name"/>
<field name="module"/>
<field name="path"/>
<field name="sequence" tree_invisible="1"/>
</tree>
]]>
trytond/ir/ui/menu.xml
+1 -1
View File
@@ -24,7 +24,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Menu" fill="1">
<field name="complete_name" icon="icon" select="1"/>
<field name="complete_name" icon="icon"/>
</tree>
]]>
</field>
trytond/ir/ui/tree.rnc
-2
View File
@@ -37,8 +37,6 @@ attlist.field &=
| "sip"
| "progressbar"
}?
attlist.field &=
[ a:defaultValue = "0" ] attribute select { "0" | "1" | "2" }?
attlist.field &=
[ a:defaultValue = "0" ] attribute tree_invisible { "0" | "1" }?
attlist.field &= attribute icon { text }?
trytond/ir/ui/tree.rng
-11
View File
@@ -105,17 +105,6 @@
</attribute>
</optional>
</define>
<define name="attlist.field" combine="interleave">
<optional>
<attribute name="select" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
<value>2</value>
</choice>
</attribute>
</optional>
</define>
<define name="attlist.field" combine="interleave">
<optional>
<attribute name="tree_invisible" a:defaultValue="0">
trytond/ir/ui/view.xml
+8 -8
View File
@@ -33,12 +33,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree>
<field name="priority" select="2"/>
<field name="model" select="1"/>
<field name="type" select="1"/>
<field name="inherit" select="1"/>
<field name="domain" select="2"/>
<field name="field_childs" select="2"/>
<field name="priority"/>
<field name="model"/>
<field name="type"/>
<field name="inherit"/>
<field name="domain"/>
<field name="field_childs"/>
</tree>
]]>
</field>
@@ -88,8 +88,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Shortcut">
<field name="name" select="1"/>
<field name="user_id" select="1"/>
<field name="name"/>
<field name="user_id"/>
<field name="sequence"/>
</tree>
]]>
trytond/model/fields/binary.py
+1 -1
View File
@@ -12,7 +12,7 @@ class Binary(Field):
_type = 'binary'
def __init__(self, string='', help='', required=False, readonly=False,
domain=None, states=None, change_default=False, select=0,
domain=None, states=None, change_default=False, select=False,
on_change=None, on_change_with=None, depends=None, filename=None,
order_field=None, context=None, loading='lazy'):
if filename is not None:
trytond/model/fields/boolean.py
+1 -1
View File
@@ -11,7 +11,7 @@ class Boolean(Field):
_type = 'boolean'
def __init__(self, string='', help='', readonly=False, domain=None,
states=None, change_default=False, select=0, on_change=None,
states=None, change_default=False, select=False, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None,
loading='eager'):
super(Boolean, self).__init__(string=string, help=help, required=False,
trytond/model/fields/char.py
+1 -1
View File
@@ -16,7 +16,7 @@ class Char(Field):
def __init__(self, string='', size=None, help='', required=False,
readonly=False, domain=None, states=None, change_default=False,
translate=False, select=0, on_change=None, on_change_with=None,
translate=False, select=False, on_change=None, on_change_with=None,
depends=None, order_field=None, context=None, loading='eager',
autocomplete=None):
'''
trytond/model/fields/field.py
+3 -5
View File
@@ -54,7 +54,7 @@ class Field(object):
_type = None
def __init__(self, string='', help='', required=False, readonly=False,
domain=None, states=None, change_default=False, select=0,
domain=None, states=None, change_default=False, select=False,
on_change=None, on_change_with=None, depends=None,
order_field=None, context=None, loading='eager'):
'''
@@ -70,9 +70,7 @@ class Field(object):
dynamically the attributes of the field.
:param change_default: A boolean. If ``True`` the field can be used as
condition for a custom default value.
:param select: An integer. When equal to ``1``, the field appears in the
search box in list view and the search will be optimized. When equal to
``2`` the field appears in the *Advanced Search* in the search box.
:param select: An boolean. When True search will be optimized.
:param on_change: A list of values. If set, the client will call the
method ``on_change_<field_name>`` when the user changes the field
value. It then passes this list of values as arguments to the
@@ -98,7 +96,7 @@ class Field(object):
self.__states = None
self.states = states or {}
self.change_default = change_default
self.select = select
self.select = bool(select)
self.__on_change = None
self.on_change = on_change
self.__on_change_with = None
trytond/model/fields/float.py
+1 -1
View File
@@ -23,7 +23,7 @@ class Float(Field):
def __init__(self, string='', digits=None, help='', required=False,
readonly=False, domain=None, states=None, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
select=False, on_change=None, on_change_with=None, depends=None,
order_field=None, context=None, loading='eager'):
'''
:param digits: a list of two integers defining the total
trytond/model/fields/many2many.py
+2 -2
View File
@@ -14,7 +14,7 @@ class Many2Many(Field):
def __init__(self, relation_name, origin, target, string='', order=None,
datetime_field=None, help='', required=False, readonly=False,
domain=None, states=None, change_default=False, select=0,
domain=None, states=None, change_default=False,
on_change=None, on_change_with=None, depends=None,
order_field=None, context=None, loading='lazy'):
'''
@@ -35,7 +35,7 @@ class Many2Many(Field):
depends = [datetime_field]
super(Many2Many, self).__init__(string=string, help=help,
required=required, readonly=readonly, domain=domain,
states=states, change_default=change_default, select=select,
states=states, change_default=change_default,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context,
loading=loading)
trytond/model/fields/many2one.py
+1 -1
View File
@@ -13,7 +13,7 @@ class Many2One(Field):
def __init__(self, model_name, string='', left=None, right=None,
ondelete='SET NULL', datetime_field=None, help='', required=False,
readonly=False, domain=None, states=None, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
select=False, on_change=None, on_change_with=None, depends=None,
order_field=None, context=None, loading='eager'):
'''
:param model_name: The name of the target model.
trytond/model/fields/one2many.py
+2 -2
View File
@@ -19,7 +19,7 @@ class One2Many(Field):
def __init__(self, model_name, field, string='', add_remove=None,
order=None, datetime_field=None, help='', required=False,
readonly=False, domain=None, states=None, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
on_change=None, on_change_with=None, depends=None,
order_field=None, context=None, loading='lazy'):
'''
:param model_name: The name of the target model.
@@ -39,7 +39,7 @@ class One2Many(Field):
depends = [datetime_field]
super(One2Many, self).__init__(string=string, help=help,
required=required, readonly=readonly, domain=domain,
states=states, change_default=change_default, select=select,
states=states, change_default=change_default,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context,
loading=loading)
trytond/model/fields/reference.py
+1 -1
View File
@@ -14,7 +14,7 @@ class Reference(Field):
def __init__(self, string='', selection=None, help='', required=False,
readonly=False, domain=None, states=None, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
select=False, on_change=None, on_change_with=None, depends=None,
order_field=None, context=None, loading='eager'):
'''
:param selection: A list or a function name that returns a list.
trytond/model/fields/selection.py
+1 -1
View File
@@ -12,7 +12,7 @@ class Selection(Field):
def __init__(self, selection, string='', sort=True, translate=True,
help='', required=False, readonly=False, domain=None, states=None,
change_default=False, select=0, on_change=None,
change_default=False, select=False, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None,
loading='eager'):
'''
trytond/model/model.py
+7
View File
@@ -539,6 +539,13 @@ class Model(WarningErrorMixin, URLMixin):
(fields.Function, fields.One2Many)) \
and not self._columns[field].order_field:
res[field]['sortable'] = False
if ((isinstance(self._columns[field], fields.Function)
and not self._columns[field].searcher)
or self._columns[field]._type in ('binary', 'many2many',
'one2many', 'sha')):
res[field]['searchable'] = False
else:
res[field]['searchable'] = True
if Transaction().context.get('language'):
# translate the field label
trytond/model/modelview.py
+1 -1
View File
@@ -372,7 +372,7 @@ class ModelView(Model):
fields_def.setdefault(depend, {'name': depend})
if ('active' in self._columns) or ('active' in self._inherit_fields):
fields_def.setdefault('active', {'name': 'active', 'select': "2"})
fields_def.setdefault('active', {'name': 'active'})
arch = etree.tostring(tree, encoding='utf-8', pretty_print=False)
fields2 = self.fields_get(fields_def.keys())
trytond/res/group.xml
+1 -1
View File
@@ -35,7 +35,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Groups" fill="1">
<field name="name" select="1"/>
<field name="name"/>
</tree>
]]>
</field>
trytond/res/request.xml
+9 -9
View File
@@ -10,15 +10,15 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<tree string="Requests">
<field name="create_date"/>
<field name="act_from" select="1"/>
<field name="act_to" select="1"/>
<field name="name" select="1"/>
<field name="priority" select="2"/>
<field name="trigger_date" select="2"/>
<field name="act_from"/>
<field name="act_to"/>
<field name="name"/>
<field name="priority"/>
<field name="trigger_date"/>
<field name="number_references"/>
<field name="state"/>
<field name="active" select="2"/>
<field name="body" tree_invisible="1" select="2"/>
<field name="active"/>
<field name="body" tree_invisible="1"/>
</tree>
]]>
</field>
@@ -119,8 +119,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Request Link">
<field name="name" select="1"/>
<field name="model" select="1"/>
<field name="name"/>
<field name="model"/>
</tree>
]]>
</field>
trytond/res/user.xml
+6 -6
View File
@@ -97,10 +97,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Users">
<field name="name" select="1"/>
<field name="login" select="1"/>
<field name="name"/>
<field name="login"/>
<field name="connections"/>
<field name="active" select="1"/>
<field name="active"/>
</tree>
]]>
</field>
@@ -190,9 +190,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Warnings">
<field name="user" select="1"/>
<field name="name" select="1"/>
<field name="always" select="1"/>
<field name="user"/>
<field name="name"/>
<field name="always"/>
</tree>
]]>
</field>
trytond/workflow/workflow.xml
+15 -15
View File
@@ -33,8 +33,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Workflow">
<field name="name" select="1"/>
<field name="model" select="1"/>
<field name="name"/>
<field name="model"/>
<field name="on_create"/>
</tree>
]]>
@@ -163,8 +163,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Activity">
<field name="name" select="1"/>
<field name="workflow" select="1"/>
<field name="name"/>
<field name="workflow"/>
<field name="method"/>
<field name="flow_start"/>
<field name="flow_stop"/>
@@ -240,8 +240,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Transitions">
<field name="act_from" select="1"/>
<field name="act_to" select="1"/>
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
<field name="group"/>
<field name="condition"/>
@@ -315,11 +315,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Instances">
<field name="workflow" select="1"/>
<field name="uid" select="2"/>
<field name="res_id" select="1"/>
<field name="res_type" select="1"/>
<field name="state" select="2"/>
<field name="workflow"/>
<field name="uid"/>
<field name="res_id"/>
<field name="res_type"/>
<field name="state"/>
</tree>
]]>
</field>
@@ -371,10 +371,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Workitems">
<field name="activity" select="1"/>
<field name="subflow" select="1"/>
<field name="instance" select="1"/>
<field name="state" select="2"/>
<field name="activity"/>
<field name="subflow"/>
<field name="instance"/>
<field name="state"/>
</tree>
]]>
</field>