summaryrefslogtreecommitdiff
path: root/addons/google_docs
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@openerp.com>2012-11-09 09:41:35 +0100
committerChristophe Matthieu <chm@openerp.com>2012-11-09 09:41:35 +0100
commitbc0a84e0978facb882f03eb2cd25586c2c3b3e61 (patch)
tree1d5db666ef28613939fd29cf41a496fe6947730e /addons/google_docs
parent4ea0e6ea0e70ba043f0645b7866e8de1086b54c8 (diff)
parent0c1bcadd230ef2a46120f9b8a6584bdce3b56e89 (diff)
[MERGE] from trunk
bzr revid: chm@openerp.com-20121109084135-lor21hoxyh5rb6i4
Diffstat (limited to 'addons/google_docs')
-rw-r--r--addons/google_docs/static/src/js/gdocs.js4
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,