From 5b686e0eed0a713cc6293f67ecf694c4311370bb Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 01:44:40 +0200 Subject: [PATCH] view manager no more oldwidgets bzr revid: al@openerp.com-20120409234440-vcg6whivq7x42sd8 --- addons/web/static/src/js/views.js | 18 ++++-------------- addons/web/static/src/xml/base.xml | 4 ++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 2e04b189fc4..d2578afc1f4 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -204,16 +204,8 @@ session.web.ActionManager = session.web.Widget.extend({ } }); -session.web.ViewManager = session.web.OldWidget.extend({ +session.web.ViewManager = session.web.Widget.extend({ template: "ViewManager", - /** - * @constructs session.web.ViewManager - * @extends session.web.OldWidget - * - * @param parent - * @param dataset - * @param views - */ init: function(parent, dataset, views, flags) { this._super(parent); this.model = dataset ? dataset.model : undefined; @@ -296,7 +288,7 @@ session.web.ViewManager = session.web.OldWidget.extend({ } controller.do_switch_view.add_last(this.on_mode_switch); controller.do_prev_view.add_last(this.on_prev_view); - var container = $("#" + this.element_id + '_view_' + view_type); + var container = this.$element.find(".oe_view_manager_view_" + view_type); view_promise = controller.appendTo(container); this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); @@ -375,12 +367,10 @@ session.web.ViewManager = session.web.OldWidget.extend({ if (this.searchview) { this.searchview.destroy(); } - this.searchview = new session.web.SearchView( - this, this.dataset, - view_id, search_defaults, this.flags.search_view === false); + this.searchview = new session.web.SearchView(this, this.dataset, view_id, search_defaults, this.flags.search_view === false); this.searchview.on_search.add(this.do_searchview_search); - return this.searchview.appendTo($("#" + this.element_id + "_search")); + return this.searchview.appendTo(this.$element.find(".oe_view_manager_view_search")); }, do_searchview_search: function(domains, contexts, groupbys) { var self = this, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 818b6f736d8..4234379b296 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -412,7 +412,7 @@

-
+
@@ -428,7 +428,7 @@
-
+