openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-improve-code-ysa into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  OpenObject Training (openobject-training)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-improve-code-ysa/+merge/59636

[IMP] training:- improve code.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-improve-code-ysa/+merge/59636
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-improve-code-ysa.

=== modified file 'training/training.py'
--- training/training.py	2011-04-27 06:42:22 +0000
+++ training/training.py	2011-05-02 04:57:29 +0000
@@ -66,22 +66,18 @@
     def _function_get(self, cr, uid, context=None):
         if context is None:
             context = {}
-
         res_partner_job_obj = self.pool.get('res.partner.job')
         ids = res_partner_job_obj.search(cr, uid, [])
-        res = res_partner_job_obj.read(cr, uid, ids, ['function'], context=context)
-        function_list = []
         done_list = []
-        for r in res:
-            if not r['function'] in function_list and r['function'] <> False:
-                function_list.append(r['function'])
-                done_list.append(r)
-        return [(r['function'], r['function']) for r in done_list]
+        for func in res_partner_job_obj.browse(cr, uid, ids, context=context):
+            if (func.function, func.function) not in done_list and func.function:
+                done_list.append((func.function, func.function))
+        return done_list
 
     _rec_name = 'kind'
     _columns = {
-        'kind' : fields.selection(lambda obj, cr, uid, context=None: obj._get_values_of_kind(), 'Kind', required=True, select=1),
-        'function': fields.selection(_function_get, 'Function', size=64),
+        'kind' : fields.selection(lambda obj, cr, uid, context=None: obj._get_values_of_kind(), 'Kind', required=True),
+        'function': fields.selection(_function_get, 'Function', required=True),
     }
 
     _sql_constraints = [
@@ -142,6 +138,8 @@
     }
 
     def _check_limits(self, cr, uid, ids, context=None):
+        if not ids:
+            return False
         obj = self.browse(cr, uid, ids)[0]
         return obj.min_limit <= obj.max_limit
 
@@ -250,15 +248,12 @@
     }
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
-            return []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
         res = []
-        for record in reads:
-            name = record['name']
-            if record['parent_id']:
-                name = record['parent_id'][1]+' / '+name
-            res.append((record['id'], name))
+        for record in self.browse(cr, uid, ids, context):
+            name = record.name
+            if record.parent_id:
+                name = record.parent_id.name + ' / ' + name
+            res.append((record.id, name))
         return res
 
 training_course_theme()
@@ -499,6 +494,8 @@
     def _check_duration(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        if not ids:
+            return False
         this = self.browse(cr, uid, ids[0], context=context)
         #return (this.duration > 0.0 or this.duration_without_children > 0.0 or this.duration_with_children > 0.0)
         return this.duration_without_children > 0.0
@@ -527,16 +524,19 @@
     def copy_data(self, cr, uid, id, default=None, context=None):
         if context is None:
             context={}
-
-        training_name = self.read(cr, uid, id, ['name'], context=context)
-
+        training_name = self.browse(cr, uid, id, context=context)
         if not default:
             default = {}
-
         default = default.copy()
-        default['name'] = training_name['name'] + _(' (copy)')
-
-        default.update({'theme_ids':[], 'questionnaire_ids':[], 'pending_ids':[], 'line_ids':[], 'purchase_line_ids':[], 'lecturer_ids':[],'budget_intra_line_ids':[], 'attachment_ids':[]})
+        default.update({'name' : training_name.name + _(' (copy)'),
+                        'theme_ids':[],
+                        'questionnaire_ids':[],
+                        'pending_ids':[],
+                        'line_ids':[],
+                        'purchase_line_ids':[],
+                        'lecturer_ids':[],
+                        'budget_intra_line_ids':[],
+                        'attachment_ids':[]})
         return super(training_course, self).copy_data(cr, uid, id, default=default, context=context)
 
     def on_change_reference(self, cr, uid, ids, reference_id, context=None):