فهرست منبع

Some travis checks cleared

Serpent Consulting Services Pvt. Ltd 9 سال پیش
والد
کامیت
4f5c442550
1فایلهای تغییر یافته به همراه15 افزوده شده و 17 حذف شده
  1. 15 17
      mass_editing/models/mass_editing.py

+ 15 - 17
mass_editing/models/mass_editing.py

@@ -21,30 +21,28 @@
 
 from openerp import models, fields, api, _
 
-class ir_model_fields(models.Model):
+class IrModelFields(models.Model):
     _inherit = 'ir.model.fields'
 
     @api.returns('self')  # If we keep @api.v7, we have to add @api.v8 code too.
-    def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
+    def search(
+            self, cr, uid, args, offset=0, limit=0, order=None, context=None,
+            count=False):
         model_domain = []
         for domain in args:
-            if domain[0] == 'model_id' and domain[2] and type(domain[2]) != list:
-                model_domain += [('model_id', 'in', map(int, domain[2][1:-1].split(',')))]
+            if (len(domain) > 2 and
+                    domain[0] == 'model_id' and
+                    isinstance(domain[2], basestring)):
+                model_domain += [
+                    ('model_id', 'in', map(int, domain[2][1:-1].split(',')))
+                ]
             else:
                 model_domain.append(domain)
-        return super(ir_model_fields, self).search(cr, uid, model_domain, offset=offset, limit=limit, order=order, context=context, count=count)
-
-
-#     @api.v8
-#     def search(self, args, offset=0, limit=0, order=None, count=False):
-#         model_domain = []
-#         for domain in args:
-#             if domain[0] == 'model_id' and domain[2] and type(domain[2]) != list:
-#                 model_domain += [('model_id', 'in', map(int, domain[2][1:-1].split(',')))]
-#             else:
-#                 model_domain.append(domain)
-#         return super(ir_model_fields, self).search(model_domain, offset=offset, limit=limit, order=order, count=count)
-
+        return super(IrModelFields, self).search(
+            cr, uid, model_domain, offset=offset, limit=limit, order=order,
+            context=context, count=count
+        )
+    
 class mass_object(models.Model):
     _name = "mass.object"