diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-07-22 12:07:39 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-07-22 12:07:39 +0200 |
| commit | efbdb34acda68984b2f9a3917757c8eb947bf30e (patch) | |
| tree | eb75a80b519bdb9cf762516f2dc16911e02f78e4 /addons/base_graph/static/src | |
| parent | da5f320a0a72c0fa4bcf2a415556f469104402da (diff) | |
| parent | 3b19c459fab04bb15570a3f1c34d6c9176608f46 (diff) | |
[merge]
bzr revid: nicolas.vanhoren@openerp.com-20110722100739-kg430kzpgsh89tug
Diffstat (limited to 'addons/base_graph/static/src')
| -rw-r--r-- | addons/base_graph/static/src/js/graph.js | 10 | ||||
| -rw-r--r-- | addons/base_graph/static/src/xml/base_graph.xml | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js index cf4cca20e59..25ce024638b 100644 --- a/addons/base_graph/static/src/js/graph.js +++ b/addons/base_graph/static/src/js/graph.js @@ -76,12 +76,20 @@ openerp.base_graph.GraphView = openerp.base.View.extend({ load_chart: function(data) { var self = this; + var domain = false; if(data){ this.x_title = this.all_fields[this.chart_info_fields]['string']; this.y_title = this.all_fields[this.operator_field]['string']; self.schedule_chart(data); }else{ - this.dataset.read_slice(this.fields, 0, false, function(res) { + if(! _.isEmpty(this.view_manager.dataset.domain)){ + domain = this.view_manager.dataset.domain; + }else if(! _.isEmpty(this.view_manager.action.domain)){ + domain = this.view_manager.action.domain; + } + this.dataset.domain = domain; + this.dataset.context = this.view_manager.dataset.context; + this.dataset.read_slice(_(this.fields).keys(), 0, false, function(res) { self.schedule_chart(res); }); } diff --git a/addons/base_graph/static/src/xml/base_graph.xml b/addons/base_graph/static/src/xml/base_graph.xml index cb5b1b2b0c4..4320b9f156e 100644 --- a/addons/base_graph/static/src/xml/base_graph.xml +++ b/addons/base_graph/static/src/xml/base_graph.xml @@ -1,6 +1,4 @@ <template> - <t t-name="GraphView"> - <h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2> - <div t-att-id="elem_id+'-'+chart+'chart'" style="height:300px;position:relative;"></div> - </t> -</template> + <div t-name="GraphView" t-att-id="elem_id+'-'+chart+'chart'" + style="height:300px;position:relative;"/> +</template>
\ No newline at end of file |