From 08f7728ff8f9f6ca293072a0c7f6af66bb7cf6fb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@tinyerp.com>
Date: Thu, 3 Dec 2009 14:09:04 +0100
Subject: [PATCH] [IMP] migrate res.user and res.config.view to the new
 configurator

bzr revid: xmo@tinyerp.com-20091203130904-9ndprgw23f4jc0ne
---
 bin/addons/base/ir/ir_actions.py |  3 +++
 bin/addons/base/res/res_user.py  | 34 +++++---------------------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index f8c6dfa8810..5662422b4b3 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -847,6 +847,9 @@ class ir_actions_configurator(osv.osv_memory):
                 'type': action.type,
                 'target': action.target,
                 }
+        self.logger.notifyChannel(
+            'actions', netsvc.LOG_INFO,
+            'all configuration actions have been executed')
         return {'type': 'ir.actions.act_window_close'}
 ir_actions_configurator()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d6b7cd6eec0..7fc985a70e5 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -255,22 +255,11 @@ class users(osv.osv):
         return dataobj.browse(cr, uid, data_id, context).res_id
 
     def action_next(self,cr,uid,ids,context=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
+        return self.pool.get('ir.actions.configurator').next(cr, uid)
 
     def action_continue(self,cr,uid,ids,context={}):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-        }
+        return self.pool.get('ir.actions.configurator').next(cr, uid)
+
     def action_new(self,cr,uid,ids,context={}):
         return {
                 'view_type': 'form',
@@ -301,13 +290,7 @@ class res_config_view(osv.osv_memory):
     }
 
     def action_cancel(self,cr,uid,ids,conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
+        return self.pool.get('ir.actions.configurator').next(cr, uid)
     def action_set(self, cr, uid, ids, context=None):
         res=self.read(cr,uid,ids)[0]
         users_obj = self.pool.get('res.users')
@@ -318,14 +301,7 @@ class res_config_view(osv.osv_memory):
                 users_obj.write(cr, uid, [uid],{
                                 'groups_id':[(4,group_ids[0])]
                             }, context=context)
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-            }
-
+        return self.pool.get('ir.actions.configurator').next(cr, uid)
 res_config_view()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: