diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-09 12:40:53 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-09 12:40:53 +0530 |
| commit | c18c3143a13bb68ff4da7916020a309c4df794cf (patch) | |
| tree | 6b3fa65135b46d3ca72d88abb4841f3dc1e553a7 /addons/google_docs/static/src | |
| parent | b405fe1641a47107f9e0d00e3710c9a8bc0d63d2 (diff) | |
| parent | 0528e00788a7cca36353a2996ab58568bdd8be78 (diff) | |
[MERGE]merge with parent branch
bzr revid: rma@tinyerp.com-20121109071053-46pb7d6v77pjzdud
Diffstat (limited to 'addons/google_docs/static/src')
| -rw-r--r-- | addons/google_docs/static/src/js/gdocs.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js index 0cc93b2510c..45e1d09d42c 100644 --- a/addons/google_docs/static/src/js/gdocs.js +++ b/addons/google_docs/static/src/js/gdocs.js @@ -16,9 +16,9 @@ var _t = instance.web._t, var view = self.getParent(); var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ]; if( !_.isEmpty(ids) ){ - view.sidebar_context().then(function (context) { + view.sidebar_context().done(function (context) { var ds = new instance.web.DataSet(this, 'ir.attachment', context); - ds.call('google_doc_get', [view.dataset.model, ids, context]).then(function(r) { + ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) { if (r == 'False') { var params = { error: response, |