summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-05-31 16:28:54 +0200
committerThibault Delavallée <tde@openerp.com>2012-05-31 16:28:54 +0200
commit3cb2fb85349fb75f10e6a1c76fa28f224f5fd8dc (patch)
treef7a3e2ac62a7af6021eb823ac46a88e4d87a418f /addons/web/static/src
parent492c3134f43aadfba3627e5bdafa4a7ab510cf12 (diff)
[IMP] FieldStatus for selection get_selection now always return a true deferred; for a selection it is resolved, because nothing asynchronous has to be done.
bzr revid: tde@openerp.com-20120531142854-qrr3zlh5m5wrjtcf
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_form.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e5cb5d34593..9dfcb6c77ce 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4126,8 +4126,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
render_list: function() {
var self = this;
// get selection values, filter them and render them
- var selection_done = this.get_selection();
- return $.when(selection_done).pipe(self.proxy('filter_selection')).pipe(self.proxy('render_elements'));
+ var selection_done = this.get_selection().pipe(self.proxy('filter_selection')).pipe(self.proxy('render_elements'));
},
/** Get the selection list to be displayed in the statusbar widget.
@@ -4166,7 +4165,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
}
else {
this.selection = this.field.selection;
- var read_defer = true;
+ var read_defer = new $.Deferred().resolve();
}
return read_defer;
},