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

[FIX] ViewManagerAction: do not initialize search view when no search view id given

Browse Source 
bzr revid: fme@openerp.com-20110421135150-5c2csi4uiug3mylt
This commit is contained in:
Fabien Meghazi
2011-04-21 15:51:50 +02:00
parent 190d61fbb9
commit 27c778c514
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/static/src/js/views.js
+10 -6
View File
@@ -193,6 +193,7 @@ openerp.base.ViewManager = openerp.base.Controller.extend({
openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
init: function(session, element_id, action, sidebar) {
console.log("init view manager action", action)
var dataset = new openerp.base.DataSetSearch(session, action.res_model);
this._super(session, element_id, dataset, action.views);
this.action = action;
@@ -220,14 +221,17 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
// init search view
var searchview_id = this.action.search_view_id && this.action.search_view_id[0];
var searchview_loaded = this.setup_search_view(
searchview_id || false, search_defaults);
if (searchview_id) {
var searchview_loaded = this.setup_search_view(
searchview_id, search_defaults);
// schedule auto_search
if (searchview_loaded != null && this.action['auto_search']) {
$.when(searchview_loaded, inital_view_loaded)
.then(this.searchview.do_search);
// schedule auto_search
if (this.action['auto_search']) {
$.when(searchview_loaded, inital_view_loaded)
.then(this.searchview.do_search);
}
}
},
stop: function() {
// should be replaced by automatic destruction implemented in BaseWidget