[MERGE] callback2deffered dataset call

bzr revid: al@openerp.com-20121015132409-et4c07ag8c9atffz
This commit is contained in:
Antony Lesuisse 2012-10-15 15:24:09 +02:00
commit 04ee6ee71f
3 changed files with 7 additions and 9 deletions

View File

@ -22,7 +22,7 @@ var _t = instance.web._t;
var form = self.getParent();
form.sidebar_context().then(function (context) {
var ds = new instance.web.DataSet(this, 'ir.attachment', context);
ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context]).then(function(r) {
if (r == 'False') {
var params = {
error: response,
@ -35,7 +35,7 @@ var _t = instance.web._t;
}
form.reload();
});
})
});
}
})
}
});
};

View File

@ -216,8 +216,7 @@ instance.web.ViewManager.include({
var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
var action_manager = new instance.web.ActionManager(self);
dataset.call('get',
['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
function(res) {
['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).then(function(res) {
var action = res[0][res[0].length - 1];
self.rpc("/web/action/load", {
action_id: action.id,

View File

@ -24,9 +24,8 @@ openerp.share = function(session) {
user_type: user_type || 'embedded',
view_type: view.fields_view.type,
invite: invite || false,
}, function(result) {
var share_id = result.result;
var step1 = Share.call('go_step_1', [[share_id],], function(result) {
}).then(function(share_id) {
var step1 = Share.call('go_step_1', [[share_id]]).then(function(result) {
var action = result;
self.do_action(action);
});