openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

xrg has proposed merging lp:~openerp-dev/openobject-server/6.0-bug-733252-xrg into lp:openobject-server/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #733252 in OpenERP Server: "osv/fields: required fields shall have ondelete="restrict" by default"
  https://bugs.launchpad.net/openobject-server/+bug/733252

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-733252-xrg/+merge/53015
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-bug-733252-xrg/+merge/53015
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/6.0-bug-733252-xrg.

=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2011-02-01 13:07:21 +0000
+++ bin/osv/fields.py	2011-03-11 13:25:16 +0000
@@ -63,7 +63,7 @@
     _symbol_set = (_symbol_c, _symbol_f)
     _symbol_get = None
 
-    def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete="set null", translate=False, select=False, **args):
+    def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, **args):
         if domain is None:
             domain = []
         if context is None:
@@ -76,7 +76,7 @@
         self.help = args.get('help', '')
         self.priority = priority
         self.change_default = change_default
-        self.ondelete = ondelete
+        self.ondelete = ondelete or (required and "restrict") or "set null"
         self.translate = translate
         self._domain = domain
         self._context = context