Wait save tree state when closing all tabs

This commit is contained in:
Cédric Krier committed 2015-03-27 15:06:29 +01:00
1 parent 9cc55449be
commit 498f671126
2 files changed
+10 -4

No files matched your search

+7 -2
View File
@@ -1274,6 +1274,8 @@
}
},
save_tree_state: function(store) {
var prms = [];
var prm;
store = (store === undefined) ? true : store;
var i, len, view, widgets, wi, wlen;
var parent_ = this.group.parent ? this.group.parent.id : null;
@@ -1287,7 +1289,8 @@
widgets = view.widgets[wid_key];
for (wi = 0, wlen = widgets.length; wi < wlen; wi++) {
if (widgets[wi].screen) {
widgets[wi].screen.save_tree_state(store);
prm = widgets[wi].screen.save_tree_state(store);
prms.push(prm);
}
}
}
@@ -1312,15 +1315,17 @@
if (store && view.attributes.tree_state) {
var tree_state_model = new Sao.Model(
'ir.ui.view_tree_state');
tree_state_model.execute('set', [
prm = tree_state_model.execute('set', [
this.model_name,
this.get_tree_domain(parent_),
view.children_field,
JSON.stringify(paths),
JSON.stringify(selected_paths)], {});
prms.push(prm);
}
}
}
return jQuery.when.apply(jQuery, prms);
},
get_tree_domain: function(parent_) {
var domain;
+3 -2
View File
@@ -135,8 +135,9 @@
});
}
if (Sao.main_menu_screen) {
Sao.main_menu_screen.save_tree_state();
Sao.main_menu_screen = null;
return Sao.main_menu_screen.save_tree_state().then(function() {
Sao.main_menu_screen = null;
});
}
return jQuery.when();
};