[FIX] Record rule/Expression : If wrong domain is supplied,system should notify inste...

bzr revid: jvo@tinyerp.com-20110228094653-y8hhu2v9bggh9nve

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index e610782..972cd4f 100644 (file)
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -24,6 +24,7 @@ from osv import fields,osv
 import time
 import tools
 from tools.safe_eval import safe_eval as eval
+from tools.translate import _
 
 class ir_rule_group(osv.osv):
     _name = 'ir.rule.group'
@@ -114,7 +115,21 @@ class ir_rule(osv.osv):
         'domain_force': fields.char('Force Domain', size=250),
         'domain': fields.function(_domain_force_get, method=True, string='Domain', type='char', size=250)
     }
-
+    
+    def _check_domain_validity(self, cr, uid, ids, context={}):
+        for record in self.browse(cr, uid, ids, context=context):
+            dom = record.domain
+            if dom:
+                try:
+                    rule_domain = self.pool.get(record.rule_group.model_id.model)._where_calc(cr, uid, dom, active_test=False)
+                except Exception:
+                    return False
+        return True
+    
+    _constraints = [
+        (_check_domain_validity, _('The domain contains wrong reference of fields! Kindly double check the domain you provided !'),['domain_force']),
+    ]
+    
     def onchange_all(self, cr, uid, ids, field_id, operator, operand):
         if not (field_id or operator or operand):
             return {}

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index 9303f35..1bc2325 100644 (file)
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -135,6 +135,8 @@ class expression(object):
                 if left == 'id' and operator == 'child_of':
                     dom = _rec_get(right, working_table)
                     self.__exp = self.__exp[:i] + dom + self.__exp[i+1:]
+                elif left != 'id':
+                    raise ValueError('Bad Domain Evaluation! %r' % (e,))
                 continue
 
             field_obj = table.pool.get(field._obj)