Browse Source

[FIX]Fixed the Basestring and search fields base on model

Saifuddin 7 years ago
parent
commit
c87507704e
2 changed files with 9 additions and 8 deletions
  1. 2 3
      mass_editing/hooks.py
  2. 7 5
      mass_editing/models/ir_model_fields.py

+ 2 - 3
mass_editing/hooks.py

@@ -4,6 +4,5 @@
 
 
 def uninstall_hook(cr, registry):
-    cr.execute("DELETE FROM ir_act_window WHERE res_model = \
-    'mass.editing.wizard'")
-    return True
+    cr.execute("""DELETE FROM ir_act_window WHERE
+    res_model = 'mass.editing.wizard'""")

+ 7 - 5
mass_editing/models/ir_model_fields.py

@@ -16,12 +16,14 @@ class IrModelFields(models.Model):
         else:
             for domain in args:
                 if (len(domain) > 2 and domain[0] == 'model_id' and
-                        isinstance(domain[2], basestring) and
+                        isinstance(domain[2], str) and
                         list(domain[2][1:-1])):
-                    model_domain += [('model_id', 'in',
-                                      map(int, domain[2][1:-1].split(',')))]
+                    model_ids = list(map(int, domain[2][1:-1].split(',')))
+                    model_domain += [('model_id', 'in', model_ids)]
                 else:
                     model_domain.append(domain)
-        return super(IrModelFields, self).search(model_domain, offset=offset,
-                                                 limit=limit, order=order,
+        return super(IrModelFields, self).search(args=model_domain, 
+                                                 offset=offset,
+                                                 limit=limit, 
+                                                 order=order,
                                                  count=count)