summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-03-05 10:58:48 +0100
committerXavier Morel <xmo@openerp.com>2012-03-05 10:58:48 +0100
commit6ffffdc4dee267d40fee3ff85274c52d17a366a7 (patch)
treedaf49407fc22a257ef2a9821c4f7cdccdbfa6d38
parent71a50a840c0f9e2f507d3a1542231b93683bc66c (diff)
[FIX] reload graph when hidden then showed so it can take account navigation done in other views and show the right 'current' diagram
bzr revid: xmo@openerp.com-20120305095848-6vy0ezahuxmkg7yk
-rw-r--r--addons/web_diagram/static/src/js/diagram.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 45ed14d8d6e..1f437fb2b81 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -357,8 +357,10 @@ openerp.web.DiagramView = openerp.web.View.extend({
this.dataset.index = this.dataset.ids.length - 1;
break;
}
- this.dataset.read_index(_.keys(this.fields_view.fields)).pipe(this.on_diagram_loaded);
+ var loaded = this.dataset.read_index(_.keys(this.fields_view.fields))
+ .pipe(this.on_diagram_loaded);
this.do_update_pager();
+ return loaded;
},
do_update_pager: function(hide_index) {
@@ -373,7 +375,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
do_show: function() {
this.do_push_state({});
- return this._super();
+ return $.when(this._super(), this.on_pager_action('reload'));
}
});
};