From c605d7a7703468622b0c33ed85b8166dd3845d02 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 11 Aug 2011 01:02:13 +0200
Subject: [PATCH] [FIX] actionmanager dialog

bzr revid: al@openerp.com-20110810230213-k9qrjv491tetsaqj
---
 addons/base/static/src/js/views.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 9bd7660e073..8865c278cbd 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -40,7 +40,7 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
             this.inner_viewmanager = null;
         }
     },
-    do_action: function(action, on_closed) {
+    do_action: function(action, on_close) {
         console.log("action",action);
         var type = action.type.replace(/\./g,'_');
         var popup = action.target === 'new';
@@ -56,22 +56,21 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
             console.log("Action manager can't handle action of type " + action.type, action);
             return;
         }
-        this[type](action, on_closed);
+        this[type](action, on_close);
     },
-    ir_actions_act_window: function (action, on_closed) {
+    ir_actions_act_window: function (action, on_close) {
         if (action.flags.popup) {
             if (this.dialog == null) {
                 this.dialog = new openerp.base.Dialog(this, { title: action.name, width: '80%' });
-                this.dialog.on_closed.add(on_closed);
+                if(on_close)
+                    this.dialog.on_close.add(on_close);
                 this.dialog.start();
-                this.dialog_viewmanager = new openerp.base.ViewManagerAction(this, action);
-                this.dialog_viewmanager.appendTo(this.dialog.$element);
-                this.dialog.open();
             } else {
                 this.dialog_viewmanager.stop();
-                this.dialog_viewmanager = new openerp.base.ViewManagerAction(this, action);
-                this.dialog_viewmanager.appendTo(this.dialog.$element);
             }
+            this.dialog_viewmanager = new openerp.base.ViewManagerAction(this, action);
+            this.dialog_viewmanager.appendTo(this.dialog.$element);
+            this.dialog.open();
         } else  {
             this.dialog_stop();
             this.inner_stop();