github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved search queries (and case insensitive).

Browse Source 
fixes #311
This commit is contained in:
Antoine Nguyen
2013-05-04 12:33:47 +02:00
parent ec699ea216
commit d50600d4a7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/models.py
+7 -4
View File
@@ -264,7 +264,7 @@ class User(AbstractBaseUser, PermissionsMixin):
.values_list('object_id', flat=True)
q = Q(pk__in=ids)
if squery:
q &= Q(username__contains=squery)
q &= Q(username__icontains=squery) | Q(email__icontains=squery)
if grpfilter and len(grpfilter):
if "SuperAdmins" in grpfilter:
q &= Q(is_superuser=True)
@@ -284,11 +284,14 @@ class User(AbstractBaseUser, PermissionsMixin):
.values_list('object_id', flat=True)
q = Q(pk__in=ids)
if squery:
if squery.find('@') != -1:
if '@' in squery:
local_part, domname = split_mailbox(squery)
q &= Q(address__contains=local_part, domain__name__contains=domname)
if local_part:
q &= Q(address__icontains=local_part)
if domname:
q &= Q(domain__name__icontains=domname)
else:
q &= Q(address__contains=squery)
q &= Q(address__icontains=squery) | Q(domain__name__icontains=squery)
aliases = Alias.objects.select_related().filter(q)
if idtfilter:
aliases = filter(lambda a: a.type in idtfilter, aliases)