pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] from trunk

Browse Source 
bzr revid: fva@openerp.com-20121017140509-67yq1gjzrs871hb6
This commit is contained in:
Frédéric van der Essen
2012-10-17 16:05:09 +02:00
parent 3f48855822 04eef2c7a0
commit cbdb0ccf9c
270 changed files with 14212 additions and 15502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/process/static/src/js/process.js
+3 -4
View File
@@ -216,13 +216,12 @@ 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,
context: dataset.context
}, function(result) {
}).then(function(result) {
action_manager.replace(self.$el);
action_manager.do_action(result.result);
})
@@ -239,7 +238,7 @@ instance.web.ViewManager.include({
title: _t('Process')
});
var form_controller = pop.view_form;
pop.on('on_write_complete', self, self.initialize_process_view);
pop.on('write_completed', self, self.initialize_process_view);
}
});
};