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

[FIX] action where res_id is defined

Browse Source 
bzr revid: al@openerp.com-20110811145904-0on11bcatcvg8r3q
This commit is contained in:
Antony Lesuisse
2011-08-11 16:59:04 +02:00
parent 1dea9ed16f
commit 1dea8eff47
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/static/src/js/view_tree.js
-1
View File
@@ -176,7 +176,6 @@ openerp.base.TreeView = openerp.base.View.extend({
}, function (actions) {
if (!actions.length) { return; }
var action = actions[0][2];
action.flags.new_window = true;
self.do_action(action);
});
},
addons/base/static/src/js/views.js
+4 -3
View File
@@ -39,7 +39,6 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
var type = action.type.replace(/\./g,'_');
var popup = action.target === 'new';
action.flags = _.extend({
popup: popup,
views_switcher : !popup,
search_view : !popup,
action_buttons : !popup,
@@ -53,7 +52,7 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
this[type](action, on_close);
},
ir_actions_act_window: function (action, on_close) {
if (action.flags.popup) {
if (action.target === 'new') {
if (this.dialog == null) {
this.dialog = new openerp.base.Dialog(this, { title: action.name, width: '80%' });
if(on_close)
@@ -252,13 +251,15 @@ openerp.base.ViewManager = openerp.base.Widget.extend({
openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
init: function(parent, action) {
this.session = parent.session;
this.action = action;
var dataset;
if (!action.res_id) {
dataset = new openerp.base.DataSetSearch(this, action.res_model, action.context, action.domain);
} else {
this.action.flags.search_view = false;
dataset = new openerp.base.DataSetStatic(this, action.res_model, action.context, [action.res_id]);
dataset.index = 0;
}
this.action = action;
this._super(parent, dataset, action.views);
this.action = action;
this.flags = this.action.flags || {};