diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-31 19:36:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-31 19:36:30 +0200 |
| commit | 8c81eaabe6b451b112f6af5b2bb06afe9ed91839 (patch) | |
| tree | 3dbfd10960e2077d6ae9025bd3c6d0b7f382772a /odoo/addons/test_new_api | |
| parent | 96de6756ab9794ad30da7965ccb723e3c44cd343 (diff) | |
Revert "[FIX] models: make `onchange` return a smaller diff"
This reverts commit 2054b5928574affbb7efcd8a9ab146ee4fa34938 which
already has been fixed multiple times [0].
However this change does not correctly handle successive onchange calls on
ony2many fields which alter existing rows.
i.e., in saas~11.4, an onchange has been added on move lines [1] in
order to create and/or update lines containing taxes amounts.
However, with diff-only onchange, a second call to onchange will discard
changes made by a first one as nothing change between the 2 calls.
Scenario: On an existing account.move, add a new credit line with a tax set.
The first onchange will update the tax line with new amount. Add a
second line (with debit amount balanced). The onchange will not change
the tax line, resulting as it value being reset to initial value. As a
result, the move is not balanced and cannot be saved.
[0] cd2ccc4110274e23607521c18309f07cca68476a, 5e58ac16c3cae2d5c45e7c9f746ed810b835a65d, 07023137cd17d8917673fd6ba7809b2870bd8cc0
[1] d49ab568a2cc5231ac12267a9e74eaf16ca45f9e
Diffstat (limited to 'odoo/addons/test_new_api')
| -rw-r--r-- | odoo/addons/test_new_api/tests/test_onchange.py | 64 |
1 files changed, 38 insertions, 26 deletions
diff --git a/odoo/addons/test_new_api/tests/test_onchange.py b/odoo/addons/test_new_api/tests/test_onchange.py index a1b2e4edfee..1bfdee908a7 100644 --- a/odoo/addons/test_new_api/tests/test_onchange.py +++ b/odoo/addons/test_new_api/tests/test_onchange.py @@ -139,10 +139,14 @@ class TestOnChange(common.TransactionCase): self.env.cache.invalidate() result = self.Discussion.onchange(values, 'name', field_onchange) self.assertIn('messages', result['value']) - self.assertEqual(result['value']['messages'], [ + self.assertItemsEqual(result['value']['messages'], [ (5,), (1, message.id, { 'name': "[%s] %s" % ("Foo", USER.name), + 'body': message.body, + 'author': message.author.name_get()[0], + 'size': message.size, + 'important': message.important, }), (0, 0, { 'name': "[%s] %s" % ("Foo", USER.name), @@ -252,7 +256,8 @@ class TestOnChange(common.TransactionCase): 'lines': [ (5,), (1, line1.id, {'name': partner2.name, - 'partner': (partner2.id, partner2.name)}), + 'partner': (partner2.id, partner2.name), + 'tags': [(5,)]}), (0, 0, {'name': partner2.name, 'partner': (partner2.id, partner2.name), 'tags': [(5,)]}), @@ -260,17 +265,6 @@ class TestOnChange(common.TransactionCase): }) # do it again, but this time with a new tag on the second line - expected_new_tag_result = { - 'name': partner2.name, - 'lines': [ - (5,), - (1, line1.id, {'name': partner2.name, - 'partner': (partner2.id, partner2.name)}), - (0, 0, {'name': partner2.name, - 'partner': (partner2.id, partner2.name), - 'tags': [(5,), (0, 0, {'name': 'Tag'})]}), - ], - } values = { 'name': partner1.name, 'partner': partner2.id, # this one just changed @@ -282,13 +276,18 @@ class TestOnChange(common.TransactionCase): self.env.cache.invalidate() result = multi.onchange(values, 'partner', field_onchange) - self.assertEqual(result['value'], expected_new_tag_result) - - # ensure ID is not returned when asked and a many2many record is set to be created - self.env.cache.invalidate() - - result = multi.onchange(values, 'partner', dict(field_onchange, **{'lines.tags.id': None})) - self.assertEqual(result['value'], expected_new_tag_result) + self.assertEqual(result['value'], { + 'name': partner2.name, + 'lines': [ + (5,), + (1, line1.id, {'name': partner2.name, + 'partner': (partner2.id, partner2.name), + 'tags': [(5,)]}), + (0, 0, {'name': partner2.name, + 'partner': (partner2.id, partner2.name), + 'tags': [(5,), (0, 0, {'name': 'Tag'})]}), + ], + }) def test_onchange_specific(self): """ test the effect of field-specific onchange method """ @@ -320,7 +319,8 @@ class TestOnChange(common.TransactionCase): self.assertIn('participants', result['value']) self.assertItemsEqual( result['value']['participants'], - [(5,)] + [(4, user.id) for user in discussion.participants + demo], + [(5,)] + [(1, user.id, {'display_name': user.display_name}) + for user in discussion.participants + demo], ) def test_onchange_default(self): @@ -356,8 +356,6 @@ class TestOnChange(common.TransactionCase): self.assertEqual(len(discussion.messages), 3) messages = [(4, msg.id) for msg in discussion.messages] messages[0] = (1, messages[0][1], {'body': 'test onchange'}) - lines = ["%s:%s" % (m.name, m.body) for m in discussion.messages] - lines[0] = "%s:%s" % (discussion.messages[0].name, 'test onchange') values = { 'name': discussion.name, 'moderator': demo.id, @@ -368,7 +366,8 @@ class TestOnChange(common.TransactionCase): } result = discussion.onchange(values, 'messages', field_onchange) self.assertIn('message_concat', result['value']) - self.assertEqual(result['value']['message_concat'], "\n".join(lines)) + self.assertEqual(result['value']['message_concat'], + "\n".join(["%s:%s" % (m.name, m.body) for m in discussion.messages])) def test_onchange_one2many_with_domain_on_related_field(self): """ test the value of the one2many field when defined with a domain on a related field""" @@ -414,15 +413,28 @@ class TestOnChange(common.TransactionCase): 'categories': [(4, cat.id) for cat in discussion.categories], 'messages': [(4, msg.id) for msg in discussion.messages], 'participants': [(4, usr.id) for usr in discussion.participants], + 'message_changes': 0, 'important_messages': [(4, msg.id) for msg in discussion.important_messages], 'important_emails': [(4, eml.id) for eml in discussion.important_emails], } - self.env.cache.invalidate() result = discussion.onchange(values, 'name', field_onchange) + # When one2many domain contains non-computed field, things are ok + self.assertEqual(result['value']['important_messages'], + [(5,)] + [(4, msg.id) for msg in discussion.important_messages]) + + # But here with commit 5676d81, we get value of: [(2, email.id)] self.assertEqual( result['value']['important_emails'], - [(5,), (1, email.id, {'name': u'[Foo Bar] %s' % USER.name})], + [(5,), + (1, email.id, { + 'name': u'[Foo Bar] %s' % USER.name, + 'body': email.body, + 'author': USER.name_get()[0], + 'important': True, + 'email_to': demo.email, + 'size': email.size, + })] ) def test_onchange_related(self): |
