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

Various fixes.

Browse Source 
see #204
This commit is contained in:
Antoine Nguyen
2012-04-10 14:44:19 +02:00
parent b4e24dc731
commit f79bf22763
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/views.py
+3 -2
View File
@@ -251,6 +251,7 @@ def deldlist(request):
def identities(request, tplname='admin/identities.html'):
accounts_list = []
squery = request.GET.get("searchquery", None)
mbalias_q = Q(domain__in=request.user.get_domains())
if squery:
accounts = User.objects.filter(username__contains=squery)
if squery.find('@') != -1:
@@ -258,10 +259,10 @@ def identities(request, tplname='admin/identities.html'):
mbaliases = Alias.objects.filter(address__contains=local_part,
domain__name__contains=domname)
else:
mbaliases = Alias.objects.filter(address__contains=squery)
mbaliases = Alias.objects.filter(mbalias_q & Q(address__contains=squery))
else:
accounts = User.objects.all()
mbaliases = Alias.objects.all()
mbaliases = Alias.objects.filter(mbalias_q)
for account in accounts:
if request.user.can_access(account) or \