Ensure clause concatination works with tuple vs list
(transplanted from 3afd52ed80da5bee8d31ba1659b0849206d7070e)
This commit is contained in:
1 parent
47b117a719
commit
0fd0579de1
2 files changed
+5
-5
No files matched your search
@@ -158,8 +158,8 @@ class Move(ModelSQL, ModelView):
|
||||
|
||||
def search_rec_name(self, cursor, user, name, clause, context=None):
|
||||
ids = self.search(cursor, user, ['OR',
|
||||
('reference',) + clause[1:],
|
||||
(self._rec_name,) + clause[1:],
|
||||
('reference',) + tuple(clause[1:]),
|
||||
(self._rec_name,) + tuple(clause[1:]),
|
||||
], context=context)
|
||||
return [('id', 'in', ids)]
|
||||
|
||||
|
||||
@@ -254,11 +254,11 @@ class Code(ModelSQL, ModelView):
|
||||
return res
|
||||
|
||||
def search_rec_name(self, cursor, user, name, clause, context=None):
|
||||
ids = self.search(cursor, user, [('code',) + clause[1:]], limit=1,
|
||||
ids = self.search(cursor, user, [('code',) + tuple(clause[1:])], limit=1,
|
||||
order=[], context=context)
|
||||
if ids:
|
||||
return [('code',) + clause[1:]]
|
||||
return [('name',) + clause[1:]]
|
||||
return [('code',) + tuple(clause[1:])]
|
||||
return [('name',) + tuple(clause[1:])]
|
||||
|
||||
def delete(self, cursor, user, ids, context=None):
|
||||
if isinstance(ids, (int, long)):
|
||||
|
||||
Reference in new issue
Block a user