From 69229c8982be2fca134ab94bc69c6b9e8d007c5c Mon Sep 17 00:00:00 2001
From: Husen Daudi <hda@tinyerp.com>
Date: Wed, 18 Jun 2008 10:34:59 +0000
Subject: [PATCH] improve window open functionality [openobject-client @
 hda@tinyerp.com-7ebe92b49e6d98d5ae4899b911ca79ba35577188]

---
 bin/modules/action/main.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/bin/modules/action/main.py b/bin/modules/action/main.py
index 69f7f38a..bdcc8e60 100644
--- a/bin/modules/action/main.py
+++ b/bin/modules/action/main.py
@@ -113,19 +113,17 @@ class main(service.Service):
 
 			if datas.get('domain', False):
 				domain.append(datas['domain'])
-			if 'target' in action:
-				if action['target']=='new':
-					dia = dialog(datas['res_model'],window=datas.get('window',None), domain=domain, context=ctx)
-					dia.but_cancel.destroy()
-					dia.but_ok.destroy()
-					print dia.run()
-#					dia.destroy()
-
-			obj = service.LocalService('gui.window')
-			obj.create(view_ids, datas['res_model'], datas['res_id'], domain,
-					action['view_type'], datas.get('window',None), ctx,
-					datas['view_mode'], name=action.get('name', False),
-					limit=datas['limit'], auto_refresh=datas['auto_refresh'])
+			if 'target' in action and action['target']=='new':
+				dia = dialog(datas['res_model'],window=datas.get('window',None), domain=domain, context=ctx)
+				dia.but_cancel.destroy()
+				dia.but_ok.destroy()
+				dia.run()
+			else:
+				obj = service.LocalService('gui.window')
+				obj.create(view_ids, datas['res_model'], datas['res_id'], domain,
+						action['view_type'], datas.get('window',None), ctx,
+						datas['view_mode'], name=action.get('name', False),
+						limit=datas['limit'], auto_refresh=datas['auto_refresh'])
 
 		elif action['type']=='ir.actions.server':
 			ctx = context.copy()
-- 
2.11.4.GIT