Skip to content

Commit af242e8

Browse files
committed
Allow TortoiseMixin.orm_get_list() to take additional parameters for related objects to prefetch, search, etc
1 parent cc3dc12 commit af242e8

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

fastadmin/models/orms/django.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import operator
21
from base64 import b64decode
32
from typing import Any
43
from uuid import UUID
@@ -276,7 +275,9 @@ def orm_get_list(
276275

277276
if search and search_fields:
278277
search_conditions = [Q(**{f + "__icontains": search}) for f in search_fields]
279-
search_q = search_conditions[0] if len(search_conditions) == 1 else operator.or_(*search_conditions)
278+
search_q = search_conditions[0]
279+
for condition in search_conditions[1:]:
280+
search_q |= condition
280281
qs = qs.filter(search_q)
281282

282283
if sort_by:

0 commit comments

Comments
 (0)