diff options
| author | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-07-21 10:48:03 +0530 |
|---|---|---|
| committer | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-07-21 10:48:03 +0530 |
| commit | 943e36cb7b75859693e72b627e495c9bc314a170 (patch) | |
| tree | 4b3844080bfa8ed9b968f4fcb209cc697e87c260 /addons/base_graph/static/src | |
| parent | 0bf100cb537f5eee493379b92968a40a7206d784 (diff) | |
| parent | 3b19c459fab04bb15570a3f1c34d6c9176608f46 (diff) | |
[MERGE] Merge with trunk upto revision no 664.
bzr revid: ysa@tinyerp.com-20110721051803-ljk33jb5oikrqgx3
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 |