diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-10-06 18:20:30 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-10-06 18:20:30 +0200 |
| commit | ef56fc10d07ad513dcbb27ef76066f44c708fa80 (patch) | |
| tree | 508bace157c80af591a18cfed79f9745e5f07f51 /addons/web_view_editor/static/src | |
| parent | 6b361ee04c067b85148f7c395cea480f4816c56e (diff) | |
| parent | 558ad0616a4fef54ec290ef1967ab0d0ac083260 (diff) | |
[MERGE] callback2deferred dataset.call
bzr revid: al@openerp.com-20121006162030-s5moj83dzegxlron
Diffstat (limited to 'addons/web_view_editor/static/src')
| -rw-r--r-- | addons/web_view_editor/static/src/js/view_editor.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index 73d07efd5c0..e65f0ab5d38 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -136,7 +136,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null); var model_dataset = new instance.web.DataSetSearch(this, 'ir.model', null, null); var view_string = "", field_name = false, self = this; - field_dataset.call( 'fields_get', [], function(fields) { + field_dataset.call( 'fields_get', []).then(function(fields) { _.each(['name', 'x_name'], function(value) { if (_.include(_.keys(fields), value)) { field_name = value; @@ -539,7 +539,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false; property_to_check.push(value); }); - field_dataset.call( 'fields_get', [], function(result) { + field_dataset.call( 'fields_get', []).then(function(result) { var fields = _.keys(result); fields.push(" "),fields.sort(); self.on_add_node(property_to_check, fields); |
