mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-17 05:41:25 +02:00
+3
-2
@@ -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 \
|
||||
|
||||
@@ -34,11 +34,6 @@
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
#filterform #id_name {
|
||||
margin-top: 10px;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
#submit_container {
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
|
||||
@@ -231,6 +231,9 @@ function filterset_created(data) {
|
||||
}
|
||||
|
||||
function filtersetform_cb() {
|
||||
$("#newfiltersset").find("input").keypress(function(e) {
|
||||
if (e.which == 13) e.preventDefault();
|
||||
});
|
||||
$(".submit").one('click', function(e) {
|
||||
simple_ajax_form_post(e, {
|
||||
reload_on_success: false,
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@
|
||||
this.$element.append(nbox);
|
||||
if (timer != undefined) {
|
||||
window.setTimeout(function() {
|
||||
$('.alert').alert('close');
|
||||
nbox.alert('close');
|
||||
}, timer);
|
||||
}
|
||||
return this;
|
||||
|
||||
+4
-1
@@ -40,7 +40,10 @@ function modalbox(e, css, defhref, defcb) {
|
||||
}
|
||||
|
||||
function modalbox_autowidth(e) {
|
||||
modalbox.apply(this, [e, {width: 'auto'}]);
|
||||
modalbox.apply(this, [e, {
|
||||
width: 'auto',
|
||||
'margin-left': function() { return -($(this).width() / 2); }
|
||||
}]);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user