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

Remove priority attribute on fields

Browse Source
This commit is contained in:
Cédric Krier
2011-01-03 12:39:29 +01:00
parent fd1d0e77a5
commit cd7ce92be9
12 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,3 +1,4 @@
* Remove priority attribute on fields
* Model doesn't convert anymore ids for inherited methods
* Remove required attribute on Boolean fields
* Add One2One field
doc/ref/models/fields.rst
-8
View File
@@ -65,14 +65,6 @@ one. Possible keys are ``required``, ``readonly`` and ``invisible``.
The values are :class:`~trytond.pyson.PYSON` statements that will be evaluated
with the values of the record.
``priority``
------------
.. attribute:: Field.priority
Give the order in which setter methods (if exist) are called on a model.
Default is 0. Lower priority called first.
``change_default``
------------------
trytond/model/fields/boolean.py
+5 -7
View File
@@ -11,14 +11,12 @@ class Boolean(Field):
_type = 'boolean'
def __init__(self, string='', help='', readonly=False, domain=None,
states=None, priority=0, change_default=False, select=0,
on_change=None, on_change_with=None, depends=None,
order_field=None, context=None):
states=None, change_default=False, select=0, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None):
super(Boolean, self).__init__(string=string, help=help, required=False,
readonly=readonly, domain=domain, states=states,
priority=priority, change_default=change_default,
select=select, on_change=on_change,
on_change_with=on_change_with, depends=depends,
order_field=order_field, context=context)
change_default=change_default, select=select,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context)
__init__.__doc__ = Field.__init__.__doc__
trytond/model/fields/char.py
+6 -7
View File
@@ -11,19 +11,18 @@ class Char(Field):
_type = 'char'
def __init__(self, string='', size=None, help='', required=False,
readonly=False, domain=None, states=None, priority=0,
change_default=False, translate=False, select=0, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None):
readonly=False, domain=None, states=None, change_default=False,
translate=False, select=0, on_change=None, on_change_with=None,
depends=None, order_field=None, context=None):
'''
:param translate: A boolean. If ``True`` the field is translatable.
:param size: A integer. If set defines the maximum size of the values.
'''
super(Char, self).__init__(string=string, help=help, required=required,
readonly=readonly, domain=domain, states=states,
priority=priority, change_default=change_default,
select=select, on_change=on_change,
on_change_with=on_change_with, depends=depends,
order_field=order_field, context=context)
change_default=change_default, select=select,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context)
self.translate = translate
self.size = size
__init__.__doc__ += Field.__init__.__doc__
trytond/model/fields/field.py
+3 -5
View File
@@ -53,9 +53,9 @@ class Field(object):
_type = None
def __init__(self, string='', help='', required=False, readonly=False,
domain=None, states=None, priority=0, change_default=False,
select=0, on_change=None, on_change_with=None,
depends=None, order_field=None, context=None):
domain=None, states=None, change_default=False, select=0,
on_change=None, on_change_with=None, depends=None,
order_field=None, context=None):
'''
:param string: A string for label of the field.
:param help: A multi-line help string.
@@ -67,7 +67,6 @@ class Field(object):
``readonly`` and ``invisible``. Values are pyson expressions that
will be evaluated with record values. This allows to change
dynamically the attributes of the field.
:param priority: Give the order in which setter methods are called.
: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
@@ -95,7 +94,6 @@ class Field(object):
self.domain = domain or []
self.__states = None
self.states = states or {}
self.priority = priority
self.change_default = change_default
self.select = select
self.__on_change = None
trytond/model/fields/float.py
+4 -5
View File
@@ -22,17 +22,16 @@ class Float(Field):
_type = 'float'
def __init__(self, string='', digits=None, help='', required=False,
readonly=False, domain=None, states=None, priority=0,
change_default=False, select=0, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None):
readonly=False, domain=None, states=None, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
order_field=None, context=None):
'''
:param digits: a list of two integers defining the total
of digits and the number of decimals of the float.
'''
super(Float, self).__init__(string=string, help=help,
required=required, readonly=readonly, domain=domain,
states=states, priority=priority,
change_default=change_default, select=select,
states=states, change_default=change_default, select=select,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context)
self.__digits = None
trytond/model/fields/many2many.py
+3 -4
View File
@@ -13,8 +13,8 @@ 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, priority=0, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
domain=None, states=None, change_default=False, select=0,
on_change=None, on_change_with=None, depends=None,
order_field=None, context=None):
'''
:param relation_name: The name of the relation model
@@ -34,8 +34,7 @@ class Many2Many(Field):
depends = [datetime_field]
super(Many2Many, self).__init__(string=string, help=help,
required=required, readonly=readonly, domain=domain,
states=states, priority=priority,
change_default=change_default, select=select,
states=states, change_default=change_default, select=select,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context)
self.relation_name = relation_name
trytond/model/fields/many2one.py
+4 -5
View File
@@ -12,9 +12,9 @@ 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, priority=0,
change_default=False, select=0, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None):
readonly=False, domain=None, states=None, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
order_field=None, context=None):
'''
:param model_name: The name of the target model.
:param left: The name of the field to store the left value for
@@ -38,8 +38,7 @@ class Many2One(Field):
depends = [datetime_field]
super(Many2One, self).__init__(string=string, help=help,
required=required, readonly=readonly, domain=domain,
states=states, priority=priority,
change_default=change_default, select=select,
states=states, change_default=change_default, select=select,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context)
self.model_name = model_name
trytond/model/fields/one2many.py
+4 -5
View File
@@ -17,9 +17,9 @@ 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, priority=0,
change_default=False, select=0, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None):
readonly=False, domain=None, states=None, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
order_field=None, context=None):
'''
:param model_name: The name of the target model.
:param field: The name of the field that handle the reverse many2one.
@@ -38,8 +38,7 @@ class One2Many(Field):
depends = [datetime_field]
super(One2Many, self).__init__(string=string, help=help,
required=required, readonly=readonly, domain=domain,
states=states, priority=priority,
change_default=change_default, select=select,
states=states, change_default=change_default, select=select,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context)
self.model_name = model_name
trytond/model/fields/reference.py
+4 -5
View File
@@ -14,9 +14,9 @@ class Reference(Field):
_type = 'reference'
def __init__(self, string='', selection=None, help='', required=False,
readonly=False, domain=None, states=None, priority=0,
change_default=False, select=0, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None):
readonly=False, domain=None, states=None, change_default=False,
select=0, on_change=None, on_change_with=None, depends=None,
order_field=None, context=None):
'''
:param selection: A list or a function name that returns a list.
The list must be a list of tuples. First member is an internal name
@@ -24,8 +24,7 @@ class Reference(Field):
'''
super(Reference, self).__init__(string=string, help=help,
required=required, readonly=readonly, domain=domain,
states=states, priority=priority,
change_default=change_default, select=select,
states=states, change_default=change_default, select=select,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context)
self.selection = selection or None
trytond/model/fields/selection.py
+4 -5
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,
priority=0, change_default=False, select=0, on_change=None,
change_default=False, select=0, on_change=None,
on_change_with=None, depends=None, order_field=None, context=None):
'''
:param selection: A list or a function name that returns a list.
@@ -22,10 +22,9 @@ class Selection(Field):
'''
super(Selection, self).__init__(string=string, help=help,
required=required, readonly=readonly, domain=domain,
states=states, priority=priority, change_default=change_default,
select=select, on_change=on_change,
on_change_with=on_change_with, depends=depends,
order_field=order_field, context=context)
states=states, change_default=change_default, select=select,
on_change=on_change, on_change_with=on_change_with,
depends=depends, order_field=order_field, context=context)
if hasattr(selection, 'copy'):
self.selection = selection.copy()
else:
trytond/model/modelsql.py
-4
View File
@@ -391,8 +391,6 @@ class ModelSQL(ModelStorage):
self._name + ',' + field, 'model',
Transaction().language, [id_new], values[field])
upd_todo.sort(lambda x, y: self._columns[x].priority - \
self._columns[y].priority)
for field in upd_todo:
self._columns[field].set([id_new], self, field, values[field])
@@ -898,8 +896,6 @@ class ModelSQL(ModelStorage):
Transaction().language, ids, values[field])
# call the 'set' method of fields
upd_todo.sort(lambda x, y: self._columns[x].priority - \
self._columns[y].priority)
for field in upd_todo:
self._columns[field].set(ids, self, field, values[field])