Various fixes.

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
+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 \
@@ -34,11 +34,6 @@
margin-top: 20px;
}
#filterform #id_name {
margin-top: 10px;
width: 200px;
}
#submit_container {
width: 100%;
position: absolute;
+3
View File
@@ -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
View File
@@ -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
View File
@@ -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); }
}]);
}
/*