summaryrefslogtreecommitdiff
path: root/addons/google_docs/static/src
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2012-11-09 14:36:23 +0100
committerOlivier Dony <odo@openerp.com>2012-11-09 14:36:23 +0100
commitd47d5f202d8da18fac46dee9a9be6613d1ef8e2f (patch)
tree703be521b4ca935d0e4375fc3e88b34558b282a3 /addons/google_docs/static/src
parentc9d5148991db5beccedc802ce56efb3689dd1527 (diff)
parentc5961309c424173953a67d873c79135a97856759 (diff)
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121109133623-pvgt4b9koun74ib3
Diffstat (limited to 'addons/google_docs/static/src')
-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,