From 6322a565f50dde247d8ff520aa319e9a58a7e8ea Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 8 Aug 2011 16:41:20 +0200 Subject: [PATCH] [IMP] Added View#do_switch_view [REM] Removed references to view_manager out of list view bzr revid: fme@openerp.com-20110808144120-xlut0922rd61moxc --- addons/base/static/src/js/list.js | 11 +++-------- addons/base/static/src/js/views.js | 3 +++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js index 04336e163c3..e4011e3fa12 100644 --- a/addons/base/static/src/js/list.js +++ b/addons/base/static/src/js/list.js @@ -85,8 +85,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi * the default behaviors and possible options for the list view. * * @constructs - * @param view_manager - * @param session An OpenERP session object + * @param parent parent object * @param element_id the id of the DOM elements this view should link itself to * @param {openerp.base.DataSet} dataset the dataset the view should work with * @param {String} view_id the listview's identifier, if any @@ -103,7 +102,6 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi init: function(parent, element_id, dataset, view_id, options) { this._super(parent, element_id); this.set_default_options(); - this.view_manager = parent || new openerp.base.NullViewManager(); this.dataset = dataset; this.model = dataset.model; this.view_id = view_id; @@ -123,7 +121,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi /** * Retrieves the view's number of records per page (|| section) * - * options > defaults > view_manager.action.limit > indefinite + * options > defaults > indefinite * * @returns {Number|null} */ @@ -131,7 +129,6 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi if (this._limit === undefined) { this._limit = (this.options.limit || this.defaults.limit - || (this.view_manager.action || {}).limit || null); } return this._limit; @@ -389,9 +386,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi view = view || 'form'; this.dataset.index = index; _.delay(_.bind(function () { - if(this.view_manager) { - this.view_manager.on_mode_switch(view); - } + this.do_switch_view(view); }, this)); }, do_show: function () { diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index b9c8a01afc3..6eb445eeed6 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -165,6 +165,7 @@ openerp.base.ViewManager = openerp.base.Widget.extend({ if (view.embedded_view) { controller.set_embedded_view(view.embedded_view); } + controller.do_switch_view.add_last(this.on_mode_switch); if (view_type === 'list' && this.flags.search_view === false && this.action && this.action['auto_search']) { // In case the search view is not instantiated: manually call ListView#search var domains = !_(self.action.domain).isEmpty() @@ -511,6 +512,8 @@ openerp.base.View = openerp.base.Widget.extend({ set_embedded_view: function(embedded_view) { this.embedded_view = embedded_view; }, + do_switch_view: function(view) { + }, set_common_sidebar_sections: function(sidebar) { sidebar.add_section('customize', "Customize", [ {