diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-11-09 10:44:44 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-11-09 10:44:44 +0100 |
| commit | d4df1e19989cdfe020dcbf638e0762d914ba320a (patch) | |
| tree | 26349c01fed69f94c7b4948570cc313bb0c303b9 /addons/google_docs/static | |
| parent | acb1156ee5c0da47a251616a61dede91bb1066b7 (diff) | |
| parent | 0c1bcadd230ef2a46120f9b8a6584bdce3b56e89 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121108164753-mso6bdwoc0ihn7sk
bzr revid: tde@openerp.com-20121109094444-5vw7aojazupnudy6
Diffstat (limited to 'addons/google_docs/static')
| -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, |