[FIX] Fixed remaining references to session.action_manager
bzr revid: fme@openerp.com-20110810103836-li6e7kx8tdk52iil
This commit is contained in:
@@ -767,8 +767,7 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
|
||||
var self = this;
|
||||
|
||||
this.view.execute_action(
|
||||
this.node.attrs, this.view.dataset, this.session.action_manager,
|
||||
this.view.datarecord.id, function () {
|
||||
this.node.attrs, this.view.dataset, this.view.datarecord.id, function () {
|
||||
self.view.reload();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -460,11 +460,10 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
|
||||
return field.name === name;
|
||||
});
|
||||
if (!action) { return; }
|
||||
this.execute_action(
|
||||
action, this.dataset, this.session.action_manager, id, function () {
|
||||
$.when(callback.apply(this, arguments).then(function () {
|
||||
self.compute_aggregates();
|
||||
}));
|
||||
this.execute_action(action, this.dataset, id, function () {
|
||||
$.when(callback.apply(this, arguments).then(function () {
|
||||
self.compute_aggregates();
|
||||
}));
|
||||
});
|
||||
},
|
||||
/**
|
||||
|
||||
@@ -177,7 +177,7 @@ openerp.base.TreeView = openerp.base.View.extend({
|
||||
if (!actions.length) { return; }
|
||||
var action = actions[0][2];
|
||||
action.flags.new_window = true;
|
||||
self.session.action_manager.do_action(action);
|
||||
self.do_action(action);
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
@@ -476,11 +476,10 @@ openerp.base.View = openerp.base.Widget.extend({
|
||||
* @param {String} [action_data.type='workflow'] the action type, if present, one of ``'object'``, ``'action'`` or ``'workflow'``
|
||||
* @param {Object} [action_data.context=null] additional action context, to add to the current context
|
||||
* @param {openerp.base.DataSet} dataset a dataset object used to communicate with the server
|
||||
* @param {openerp.base.ActionManager} action_manager object able to actually execute the action, if any is fetched
|
||||
* @param {Object} [record_id] the identifier of the object on which the action is to be applied
|
||||
* @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
|
||||
*/
|
||||
execute_action: function (action_data, dataset, action_manager, record_id, on_closed) {
|
||||
execute_action: function (action_data, dataset, record_id, on_closed) {
|
||||
var self = this;
|
||||
var handler = function (r) {
|
||||
var action = r.result;
|
||||
|
||||
@@ -333,7 +333,6 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
|
||||
type: 'object',
|
||||
name: 'action_launch'
|
||||
}, self.dataset,
|
||||
self.session.action_manager,
|
||||
$(this).data('id'), function () {
|
||||
// after action popup closed, refresh configuration
|
||||
// thingie
|
||||
|
||||
@@ -442,7 +442,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
|
||||
}
|
||||
views.push(view);
|
||||
});
|
||||
this.session.action_manager.do_action({
|
||||
this.do_action({
|
||||
"res_model" : this.dataset.model,
|
||||
"domain" : this.dataset.domain,
|
||||
"views" : views,
|
||||
|
||||
Reference in New Issue
Block a user