allow JL5 to search users by email
parent
a595824d94
commit
9db575ae93
|
@ -403,17 +403,18 @@ def searchusers(v):
|
||||||
|
|
||||||
if 'q' in criteria:
|
if 'q' in criteria:
|
||||||
term = criteria['q'][0]
|
term = criteria['q'][0]
|
||||||
|
|
||||||
term = sanitize_username(term)
|
term = sanitize_username(term)
|
||||||
|
|
||||||
users = users.filter(
|
or_criteria = [
|
||||||
or_(
|
User.username.ilike(f'%{term}%'),
|
||||||
User.username.ilike(f'%{term}%'),
|
User.original_username.ilike(f'%{term}%'),
|
||||||
User.original_username.ilike(f'%{term}%'),
|
User.extra_username.ilike(f'%{term}%'),
|
||||||
User.extra_username.ilike(f'%{term}%'),
|
User.prelock_username.ilike(f'%{term}%'),
|
||||||
User.prelock_username.ilike(f'%{term}%'),
|
]
|
||||||
)
|
if v.admin_level >= PERMS['VIEW_EMAILS']:
|
||||||
).order_by(User.username.ilike(term).desc(), User.stored_subscriber_count.desc())
|
or_criteria.append(User.email.ilike(f'%{term}%'))
|
||||||
|
|
||||||
|
users = users.filter(or_(*or_criteria)).order_by(User.username.ilike(term).desc(), User.stored_subscriber_count.desc())
|
||||||
|
|
||||||
total = users.count()
|
total = users.count()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue