summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorAlexandre Kühn <alex.e.kuhn@gmail.com>2018-01-14 21:34:13 +0100
committerAlexandre Kühn <alex.e.kuhn@gmail.com>2018-01-15 10:03:14 +0100
commit2a5488619da22cfd901963dd141e722b195e82ab (patch)
tree79c2d7ce5b5a332c63badab2be0fc9974fb1b362 /addons/web/static/src
parent2a244e3e669c85a4a953b3e668c0545bfe658edd (diff)
[FIX] web: disable {bin_size: true} on binary fields
Revision on 41fe7f9d1113d026b226b136b4477aaaf9f1f638 This commit intended to reduce the network load when reading records with binary fields. This was made possible by enforcing the contextual key `bin_size` to be set for records with binary fields. However, it is causing some issues (see #22222, #22231) which are: - write with bin_size:true generates a traceback - read/search_read with bin_size:true breaks some images on some views (e.g. base.view_partner_form) Since the problems outweight the gain of these changes, we revert them.
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/fields/basic_fields.js1
-rw-r--r--addons/web/static/src/js/services/data_manager.js4
-rw-r--r--addons/web/static/src/js/views/basic/basic_model.js9
3 files changed, 1 insertions, 13 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index aab0e42c318..09406b43711 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -1080,7 +1080,6 @@ var AbstractFieldBinary = AbstractField.extend({
},
'click .o_clear_file_button': 'on_clear',
}),
- context: { bin_size: true },
init: function (parent, name, record) {
this._super.apply(this, arguments);
this.fields = record.fields;
diff --git a/addons/web/static/src/js/services/data_manager.js b/addons/web/static/src/js/services/data_manager.js
index 6e39ede94e8..9b11f3a54a7 100644
--- a/addons/web/static/src/js/services/data_manager.js
+++ b/addons/web/static/src/js/services/data_manager.js
@@ -387,10 +387,6 @@ return core.Class.extend({
attrs.fieldDependencies = attrs.Widget.prototype.fieldDependencies;
}
- if (attrs.Widget.prototype.context) {
- attrs.context = attrs.Widget.prototype.context;
- }
-
return attrs;
},
/**
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index a6979776c99..d7fbee2b30d 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -1854,7 +1854,7 @@ var BasicModel = AbstractModel.extend({
model: record.model,
method: 'read',
args: [[record.res_id], fieldNames],
- context: record.getContext(),
+ context: _.extend({}, record.getContext(), {bin_size: true}),
})
.then(function (result) {
if (result.length === 0) {
@@ -3094,13 +3094,6 @@ var BasicModel = AbstractModel.extend({
// datapoint context is extended by fields widgets
var context = _.extend({}, params.context);
- if (params.fieldsInfo && params.viewType) {
- _.each(params.fieldsInfo[params.viewType], function (field) {
- if (field.context) {
- _.extend(context, field.context);
- }
- });
- }
var dataPoint = {
_cache: type === 'list' ? {} : undefined,