From c1191b54efe92554ed355a3f51c8d78c2048d571 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 10 Aug 2011 03:52:11 +0200 Subject: [PATCH] more nivification of ViewManager bzr revid: al@openerp.com-20110810015211-mwyex6w9pze8djk2 --- addons/base/static/src/js/form.js | 4 ++-- addons/base/static/src/js/views.js | 2 +- addons/base_dashboard/static/src/js/dashboard.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 90e5e907c8b..e488bb3dfa1 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1648,7 +1648,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ }); this.views = views; - this.viewmanager = new openerp.base.ViewManager(this, this.element_id, this.dataset, views); + this.viewmanager = new openerp.base.ViewManager(this, this.dataset, views); this.viewmanager.registry = openerp.base.views.clone({ list: 'openerp.base.form.One2ManyListView', form: 'openerp.base.form.One2ManyFormView' @@ -1674,7 +1674,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({ self.save_form_view(); }); setTimeout(function () { - self.viewmanager.start(); + self.viewmanager.appendTo(this.$element); }, 0); }, reload_current_view: function() { diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 31fcf45ffa6..f3e0bf2fc64 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -77,7 +77,6 @@ openerp.base.ActionManager = openerp.base.Widget.extend({ ir_actions_act_window: function (action, on_closed) { if (action.flags.popup) { if (this.dialog == null) { - debugger; this.dialog = new openerp.base.ActionDialog(this, { title: action.name, width: '80%' }); this.dialog.close_callback = on_closed; this.dialog.start(false); @@ -300,6 +299,7 @@ openerp.base.NullViewManager = openerp.base.generate_null_object_class(openerp.b } }); +// Move parts or everything to ActionManager openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ init: function(parent, action) { this.session = parent.session; diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js index a30985001c7..d03923b19e4 100644 --- a/addons/base_dashboard/static/src/js/dashboard.js +++ b/addons/base_dashboard/static/src/js/dashboard.js @@ -228,9 +228,9 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ action_buttons : false, pager: false }; - new openerp.base.ActionManager( - this, this.view.element_id + '_action_' + action.id) - .do_action(action); + var am = new openerp.base.ActionManager(this); + am.appendTo($("#"+this.view.element_id + '_action_' + action.id)); + am.do_action(action); }, render: function() { // We should start with three columns available