view manager no more oldwidgets
bzr revid: al@openerp.com-20120409234440-vcg6whivq7x42sd8
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -412,7 +412,7 @@
|
||||
<h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
|
||||
<span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
|
||||
</h2>
|
||||
<div t-attf-id="#{widget.element_id}_search" t-opentag="true"/>
|
||||
<div class="oe_view_manager_view_search" t-opentag="true"/>
|
||||
</div>
|
||||
<div class="oe_view_manager_row">
|
||||
<div class="oe_view_manager_buttons"/>
|
||||
@@ -428,7 +428,7 @@
|
||||
</div>
|
||||
<div class="oe_view_manager_body">
|
||||
<t t-foreach="widget.views_src" t-as="view">
|
||||
<div t-attf-id="#{widget.element_id}_view_#{view.view_type}"/>
|
||||
<div t-attf-class="oe_view_manager_view_#{view.view_type}"/>
|
||||
</t>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user