[MERGE]: Merge with latest trunk

bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl

1 files changed, 18 insertions, 28 deletions

diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index 9e836ec9d0e..8b6f1157a29 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -19,28 +19,25 @@
 #
 ##############################################################################
 
-import os
-
-import wizard
 from tools.translate import _
-import pooler
 from osv import osv, fields
 
-class quality_check(wizard.interface):
-
-    def _create_quality_check(self, cr, uid, data, context=None):
-        pool = pooler.get_pool(cr.dbname)
-        obj_quality = pool.get('module.quality.check')
-        objs = []
-        for id in data['ids']:
-            module_data = pool.get('ir.module.module').browse(cr, uid, id)
-            data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
-            obj = obj_quality.create(cr, uid, data, context)
-            objs.append(obj)
-        return objs
-
-    def _open_quality_check(self, cr, uid, data, context):
-        obj_ids = self._create_quality_check(cr, uid, data, context)
+class quality_check(osv.osv_memory):
+    _name = "quality.check"
+    _description = "Module Quality Check"
+
+    def _create_quality_check(self, cr, uid, ids, context=None):
+        obj_quality = self.pool.get('module.quality.check')
+        objs_ids = []
+        module_id = context.get('active_id', False)
+        module_data = self.pool.get('ir.module.module').browse(cr, uid, module_id, context=context)
+        data = obj_quality.check_quality(cr, uid, module_data.name, module_data.state)
+        obj = obj_quality.create(cr, uid, data, context=context)
+        objs_ids.append(obj)
+        return objs_ids
+
+    def open_quality_check(self, cr, uid, ids, context=None):
+        obj_ids = self._create_quality_check(cr, uid, ids, context=context)
         return {
             'domain': "[('id','in', ["+','.join(map(str,obj_ids))+"])]",
             'name': _('Quality Check'),
@@ -49,14 +46,7 @@ class quality_check(wizard.interface):
             'res_model': 'module.quality.check',
             'type': 'ir.actions.act_window'
             }
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result': {'type':'action', 'action':_open_quality_check, 'state':'end'}
-        }
-    }
-
-quality_check("create_quality_check_wiz")
+        
+quality_check()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file