Reviewers: ,
Please review this at http://codereview.tryton.org/685002/
Affected files:
M trytond/backend/fields.py
M trytond/model/modelsql.py
M trytond/tests/test_access.py
Index: trytond/backend/fields.py
===================================================================
--- a/trytond/backend/fields.py
+++ b/trytond/backend/fields.py
@@ -21,10 +21,7 @@
class Boolean(Field):
-
- @staticmethod
- def sql_format(value):
- return value
+ pass
class Integer(Field):
@@ -147,10 +144,7 @@
class Binary(Field):
-
- @staticmethod
- def sql_format(value):
- return value or None
+ pass
class Selection(Char):
@@ -173,7 +167,10 @@
@staticmethod
def sql_format(value):
- return value and int(value) or None
+ if value is None:
+ return None
+ assert value is not False
+ return int(value)
class One2Many(Field):
Index: trytond/model/modelsql.py
===================================================================
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -1055,7 +1055,7 @@
models = Model.browse([x[0] for x in cursor.fetchall()])
if models:
Model.write(models, {
- field_name: False,
+ field_name: None,
})
for Model, field_name in foreign_keys_todelete:
Index: trytond/tests/test_access.py
===================================================================
--- a/trytond/tests/test_access.py
+++ b/trytond/tests/test_access.py
@@ -38,7 +38,7 @@
# One access allowed for any group
model_access_wo_group, = self.model_access.create([{
'model': model.id,
- 'group': False,
+ 'group': None,
'perm_read': True,
}])
self.test_access.read([test.id])
@@ -121,7 +121,7 @@
# One access allowed for any group
model_access_wo_group, = self.model_access.create([{
'model': model.id,
- 'group': False,
+ 'group': None,
'perm_write': True,
}])
self.test_access.write([test], {})
@@ -201,7 +201,7 @@
# One access allowed for any group
model_access_wo_group, = self.model_access.create([{
'model': model.id,
- 'group': False,
+ 'group': None,
'perm_create': True,
}])
self.test_access.create([{}])
@@ -284,7 +284,7 @@
# One access allowed for any group
model_access_wo_group, = self.model_access.create([{
'model': model.id,
- 'group': False,
+ 'group': None,
'perm_delete': True,
}])
self.test_access.delete([tests.pop()])
@@ -399,7 +399,7 @@
# One access allowed for any group
field_access_wo_group, = self.field_access.create([{
'field': field1.id,
- 'group': False,
+ 'group': None,
'perm_read': True,
}])
self.test_access.read([test.id], ['field1'])
@@ -530,12 +530,12 @@
field_access1, = self.field_access.create([{
'field': field1.id,
- 'group': False,
+ 'group': None,
'perm_read': True,
}])
field_access2, = self.field_access.create([{
'field': field2.id,
- 'group': False,
+ 'group': None,
'perm_read': True,
}])
@@ -607,7 +607,7 @@
# One access allowed for any group
field_access_wo_group, = self.field_access.create([{
'field': field1.id,
- 'group': False,
+ 'group': None,
'perm_write': True,
}])
self.test_access.write([test], {})
@@ -738,12 +738,12 @@
field_access1, = self.field_access.create([{
'field': field1.id,
- 'group': False,
+ 'group': None,
'perm_write': True,
}])
field_access2, = self.field_access.create([{
'field': field2.id,
- 'group': False,
+ 'group': None,
'perm_write': True,
}])
--
--
[email protected] mailing list
---
You received this message because you are subscribed to the Google Groups "tryton-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
