diff options
| author | Christophe Matthieu <chm@odoo.com> | 2017-03-21 15:30:58 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2017-04-11 19:44:38 +0200 |
| commit | eaa66d11568b415b8d6b4c7a17a058b5ec1df4a6 (patch) | |
| tree | 822fe86e984e69f989c3574936fe1792ae96fe9b /addons/web/static/src/js/views/graph/graph_view.js | |
| parent | e1eea38f2f940fbe252273a5a9d4d03474f81d0a (diff) | |
[REF] web: change internal representation of fields and view meta datas
* Data manager load_view returns a viewInfo object
* ViewInfo contains: the arch, fields and fieldsInfo objects, and some extra informations
* The fields come from the server and are frozen, without any view attributes (depend of the model).
* The fieldsInfo contains every view attributes and informations.
Diffstat (limited to 'addons/web/static/src/js/views/graph/graph_view.js')
| -rw-r--r-- | addons/web/static/src/js/views/graph/graph_view.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/addons/web/static/src/js/views/graph/graph_view.js b/addons/web/static/src/js/views/graph/graph_view.js index 3422a0922d3..1d4ee29ef63 100644 --- a/addons/web/static/src/js/views/graph/graph_view.js +++ b/addons/web/static/src/js/views/graph/graph_view.js @@ -27,13 +27,13 @@ var GraphView = AbstractView.extend({ /** * @override */ - init: function (arch, fields) { + init: function (viewInfo) { this._super.apply(this, arguments); var initialMeasure = '__count__'; var initialGroupBys = []; - fields.__count__ = {string: _t("Count"), type: "integer"}; - arch.children.forEach(function (field) { + viewInfo.fields = _.defaults({__count__: {string: _t("Count"), type: "integer"}}, viewInfo.fields); + viewInfo.arch.children.forEach(function (field) { var name = field.attrs.name; if (field.attrs.interval) { name += ':' + field.attrs.interval; @@ -46,7 +46,7 @@ var GraphView = AbstractView.extend({ }); var measures = {__count__: {string: _t("Count"), type: "integer"}}; - _.each(fields, function (field, name) { + _.each(viewInfo.fields, function (field, name) { if (name !== 'id' && field.store === true) { if (field.type === 'integer' || field.type === 'float' || field.type === 'monetary') { measures[name] = field; @@ -55,12 +55,12 @@ var GraphView = AbstractView.extend({ }); this.controllerParams.measures = measures; - this.rendererParams.stacked = arch.attrs.stacked !== "False"; + this.rendererParams.stacked = viewInfo.arch.attrs.stacked !== "False"; - this.loadParams.initialMode = arch.attrs.type || 'bar'; + this.loadParams.initialMode = viewInfo.arch.attrs.type || 'bar'; this.loadParams.initialMeasure = initialMeasure; this.loadParams.initialGroupBys = initialGroupBys; - this.loadParams.fields = fields; + this.loadParams.fields = viewInfo.fields; }, }); |
