summaryrefslogtreecommitdiff
path: root/addons/google_docs/static/src
diff options
context:
space:
mode:
authorKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>2012-11-09 10:59:19 +0530
committerKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>2012-11-09 10:59:19 +0530
commitd251e8e63f148296dbf8d12650c773cb9db0431f (patch)
tree77850de1cf7b52064980b0a3a55e61707663525d /addons/google_docs/static/src
parent746e31c2f09c5ee18d2bda51cb9b04283c3b50c1 (diff)
parent0528e00788a7cca36353a2996ab58568bdd8be78 (diff)
[MERGE]merge with trunk
bzr revid: kbh@tinyerp.com-20121109052919-q1oo1us9il2jrqf4
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,