Cédric Krier pushed to branch branch/default at Tryton / Tryton


Commits:
7b9b3e13 by Cédric Krier at 2023-02-07T16:44:14+01:00
Fill DomainValidationError message using an invalid record

The invalid relations are the invalid records only if Target is the class..
- - - - -
02532abc by Cédric Krier at 2023-02-07T16:44:30+01:00
Test message of DomainValidationError
- - - - -


5 changed files:

- trytond/trytond/model/modelstorage.py
- trytond/trytond/tests/test_field_integer.py
- trytond/trytond/tests/test_field_many2one.py
- trytond/trytond/tests/test_field_one2one.py
- trytond/trytond/tests/test_field_reference.py


Changes:

=====================================
trytond/trytond/model/modelstorage.py
=====================================
@@ -1266,6 +1266,14 @@
                                 [('id', 'in', [r.id for r in sub_relations])],
                                 domain,
                                 ])
-                    invalid_records = sub_relations - set(finds)
+                    invalid_relations = sub_relations - set(finds)
+                    if Relation == cls and field._type not in {
+                            'many2one', 'one2many', 'many2many', 'one2one',
+                            'reference'}:
+                        invalid_records = invalid_relations
+                    else:
+                        invalid_records = [
+                            r for r in records
+                            if getattr(r, field.name) in invalid_relations]
                     if invalid_records:
                         invalid_record = invalid_records.pop()
@@ -1270,5 +1278,10 @@
                     if invalid_records:
                         invalid_record = invalid_records.pop()
+                        if invalid_relations == invalid_records:
+                            invalid_relation = invalid_record
+                        else:
+                            invalid_relation = getattr(
+                                invalid_record, field.name)
                         domain = field.domain
                         if is_pyson(domain):
                             domain = _record_eval_pyson(records[0], domain)
@@ -1288,7 +1301,7 @@
                         else:
                             fields.add(field.name)
                         for field_name in sorted(fields):
-                            env = EvalEnvironment(invalid_record, Relation)
+                            env = EvalEnvironment(invalid_relation, Relation)
                             invalid_domain = domain_inversion(
                                 domain, field_name, env)
                             if isinstance(invalid_domain, bool):


=====================================
trytond/trytond/tests/test_field_integer.py
=====================================
@@ -113,7 +113,10 @@
         "Test create integer with domain invalid"
         Integer = Pool().get('test.integer_domain')
 
-        with self.assertRaises(DomainValidationError):
+        with self.assertRaisesRegexp(
+                DomainValidationError,
+                'The value "10" for field "Integer" '
+                'in ".*" of "Integer Domain"'):
             Integer.create([{
                         'integer': 10,
                         }])


=====================================
trytond/trytond/tests/test_field_many2one.py
=====================================
@@ -78,7 +78,10 @@
         Many2One = pool.get('test.many2one_domainvalidation')
         target, = Target.create([{'value': 1}])
 
-        with self.assertRaises(DomainValidationError):
+        with self.assertRaisesRegexp(
+                DomainValidationError,
+                'The value "%s" for field "many2one" '
+                'in ".*" of "Many2One Domain Validation"' % target.rec_name):
             Many2One.create([{
                         'many2one': target.id,
                         }])


=====================================
trytond/trytond/tests/test_field_one2one.py
=====================================
@@ -120,7 +120,10 @@
                     'name': "invalid domain",
                     }])
 
-        with self.assertRaises(DomainValidationError):
+        with self.assertRaisesRegexp(
+                DomainValidationError,
+                'The value "%s" for field "One2One" '
+                'in ".*" of "One2One"' % target.rec_name):
             One2One.create([{
                         'one2one': target.id,
                         }])


=====================================
trytond/trytond/tests/test_field_reference.py
=====================================
@@ -482,7 +482,10 @@
         target.save()
 
         reference = Reference(reference=target)
-        with self.assertRaises(DomainValidationError):
+        with self.assertRaisesRegexp(
+                DomainValidationError,
+                'The value "%s" for field "Reference" '
+                'in ".*" of "Reference Domain Validation"' % target.rec_name):
             reference.save()
 
     @with_transaction()



View it on Heptapod: 
https://foss.heptapod.net/tryton/tryton/-/compare/d90d4ee0a2cab5faf93d565d3e92e2e3aab17e8b...02532abcadcd3d4bec4fe108ea2dac528cfa3a3b

-- 
View it on Heptapod: 
https://foss.heptapod.net/tryton/tryton/-/compare/d90d4ee0a2cab5faf93d565d3e92e2e3aab17e8b...02532abcadcd3d4bec4fe108ea2dac528cfa3a3b
You're receiving this email because of your account on foss.heptapod.net.


Reply via email to