diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-12-12 15:35:11 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-12-12 15:35:11 +0100 |
| commit | 5701010d0ddbc9fb09ccc9262e83ac3ca6935a4e (patch) | |
| tree | 4b0b519a12e5149f896e66519ec7c428dd6e6e51 /odoo | |
| parent | 791e0cf47a84d7c3bd4cfb6404144f9aff2ca78c (diff) | |
| parent | 744c2934b3ad748c41a0b3a97272d38a75b14e76 (diff) | |
[MERGE] forward port branch saas-14 up to 744c2934b3a
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/ir/ir_qweb/assetsbundle.py | 3 | ||||
| -rw-r--r-- | odoo/fields.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/odoo/addons/base/ir/ir_qweb/assetsbundle.py b/odoo/addons/base/ir/ir_qweb/assetsbundle.py index 47a7cd1b8b8..3c11e9d0bc0 100644 --- a/odoo/addons/base/ir/ir_qweb/assetsbundle.py +++ b/odoo/addons/base/ir/ir_qweb/assetsbundle.py @@ -198,12 +198,15 @@ class AssetsBundle(object): return self.env['ir.attachment'].sudo().browse(attachment_ids) def save_attachment(self, type, content, inc=None): + assert type in ('js', 'css') ira = self.env['ir.attachment'] fname = '%s%s.%s' % (self.name, ('' if inc is None else '.%s' % inc), type) + mimetype = 'application/javascript' if type == 'js' else 'text/css' values = { 'name': "/web/content/%s" % type, 'datas_fname': fname, + 'mimetype' : mimetype, 'res_model': 'ir.ui.view', 'res_id': False, 'type': 'binary', diff --git a/odoo/fields.py b/odoo/fields.py index 3f32f68a765..861eee4132b 100644 --- a/odoo/fields.py +++ b/odoo/fields.py @@ -974,11 +974,11 @@ class Field(object): spec = self.modified_draft(record) # set value in cache, inverse field, and mark record as dirty - record._cache[self] = value + env.cache[self][record.id] = value if env.in_onchange: for invf in record._field_inverses[self]: invf._update(record[self.name], record) - record._set_dirty(self.name) + env.dirty[record].add(self.name) # determine more dependent fields, and invalidate them if self.relational: @@ -991,7 +991,7 @@ class Field(object): record.write({self.name: write_value}) # Update the cache unless value contains a new record if not (self.relational and not all(value)): - record._cache[self] = value + env.cache[self][record.id] = value ############################################################################ # |