Please review this at http://codereview.appspot.com/3816044/
Affected files:
M CHANGELOG
M doc/ref/models/fields.rst
M trytond/model/fields/boolean.py
M trytond/model/fields/char.py
M trytond/model/fields/field.py
M trytond/model/fields/float.py
M trytond/model/fields/many2many.py
M trytond/model/fields/many2one.py
M trytond/model/fields/one2many.py
M trytond/model/fields/reference.py
M trytond/model/fields/selection.py
M trytond/model/modelsql.py
Index: CHANGELOG
===================================================================
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
Index: doc/ref/models/fields.rst
===================================================================
--- a/doc/ref/models/fields.rst
+++ b/doc/ref/models/fields.rst
@@ -65,14 +65,6 @@
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``
------------------
Index: trytond/model/fields/boolean.py
===================================================================
--- a/trytond/model/fields/boolean.py
+++ b/trytond/model/fields/boolean.py
@@ -11,14 +11,12 @@
_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__
Index: trytond/model/fields/char.py
===================================================================
--- a/trytond/model/fields/char.py
+++ b/trytond/model/fields/char.py
@@ -11,19 +11,18 @@
_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__
Index: trytond/model/fields/field.py
===================================================================
--- a/trytond/model/fields/field.py
+++ b/trytond/model/fields/field.py
@@ -53,9 +53,9 @@
_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 @@
``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 @@
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
Index: trytond/model/fields/float.py
===================================================================
--- a/trytond/model/fields/float.py
+++ b/trytond/model/fields/float.py
@@ -22,17 +22,16 @@
_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
Index: trytond/model/fields/many2many.py
===================================================================
--- a/trytond/model/fields/many2many.py
+++ b/trytond/model/fields/many2many.py
@@ -13,8 +13,8 @@
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 @@
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
Index: trytond/model/fields/many2one.py
===================================================================
--- a/trytond/model/fields/many2one.py
+++ b/trytond/model/fields/many2one.py
@@ -12,9 +12,9 @@
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 @@
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
Index: trytond/model/fields/one2many.py
===================================================================
--- a/trytond/model/fields/one2many.py
+++ b/trytond/model/fields/one2many.py
@@ -17,9 +17,9 @@
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 @@
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
Index: trytond/model/fields/reference.py
===================================================================
--- a/trytond/model/fields/reference.py
+++ b/trytond/model/fields/reference.py
@@ -14,9 +14,9 @@
_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 @@
'''
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
Index: trytond/model/fields/selection.py
===================================================================
--- a/trytond/model/fields/selection.py
+++ b/trytond/model/fields/selection.py
@@ -12,7 +12,7 @@
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 @@
'''
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:
Index: trytond/model/modelsql.py
===================================================================
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -391,8 +391,6 @@
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 @@
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])
--
Cédric Krier
B2CK SPRL
Rue de Rotterdam, 4
4000 Liège
Belgium
Tel: +32 472 54 46 59
Email/Jabber: [email protected]
Website: http://www.b2ck.com/
pgp59D3NLpU5C.pgp
Description: PGP signature
