Browse Source

Show stopper on banning admin.

Ralfp 12 years ago
parent
commit
84b5a74cc6

+ 1 - 2
misago/banning/decorators.py

@@ -1,10 +1,9 @@
-from misago.banning.views import error_banned
-
 def block_banned(f):
 def block_banned(f):
     def decorator(*args, **kwargs):
     def decorator(*args, **kwargs):
         request = args[0]
         request = args[0]
         try:
         try:
             if request.ban.is_banned():
             if request.ban.is_banned():
+                from misago.banning.views import error_banned
                 return error_banned(request);
                 return error_banned(request);
             return f(*args, **kwargs)
             return f(*args, **kwargs)
         except AttributeError:
         except AttributeError:

+ 0 - 1
misago/banning/models.py

@@ -3,7 +3,6 @@ from django.utils import timezone
 from django.db import models
 from django.db import models
 from django.db.models import Q
 from django.db.models import Q
 
 
-
 BAN_NAME_EMAIL = 0
 BAN_NAME_EMAIL = 0
 BAN_NAME = 1
 BAN_NAME = 1
 BAN_EMAIL = 2
 BAN_EMAIL = 2

+ 4 - 3
misago/banning/views.py

@@ -1,8 +1,11 @@
+from misago.admin import site
+print site.get_action('bans')
 from django.core.urlresolvers import reverse as django_reverse
 from django.core.urlresolvers import reverse as django_reverse
 from django.db.models import Q
 from django.db.models import Q
 from django.template import RequestContext
 from django.template import RequestContext
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext as _
 from misago.admin import site
 from misago.admin import site
+print site.get_action('bans')
 from misago.admin.widgets import *
 from misago.admin.widgets import *
 from misago.banning.forms import BanForm, SearchBansForm
 from misago.banning.forms import BanForm, SearchBansForm
 from misago.banning.models import Ban
 from misago.banning.models import Ban
@@ -166,6 +169,4 @@ class Delete(ButtonWidget):
         if target.type == 2:
         if target.type == 2:
             return Message(_('E-mail Ban "%(ban)s" has been lifted.') % {'ban': target.ban}, 'success'), False
             return Message(_('E-mail Ban "%(ban)s" has been lifted.') % {'ban': target.ban}, 'success'), False
         if target.type == 3:
         if target.type == 3:
-            return Message(_('IP Ban "%(ban)s" has been lifted.') % {'ban': target.ban}, 'success'), False
-        
-        
+            return Message(_('IP Ban "%(ban)s" has been lifted.') % {'ban': target.ban}, 'success'), False        

+ 2 - 2
misago/bruteforce/fixtures.py

@@ -18,8 +18,8 @@ settings_fixtures = (
                 'description':  _('Enter maximal number of allowed attempts before IP address "jams". Defautly forum records only failed sign-in attempts.'),
                 'description':  _('Enter maximal number of allowed attempts before IP address "jams". Defautly forum records only failed sign-in attempts.'),
             }),
             }),
             ('registrations_jams', {
             ('registrations_jams', {
-                'value':        1,
-                'default':      1,
+                'value':        False,
+                'default':      False,
                 'type':         "boolean",
                 'type':         "boolean",
                 'input':        "yesno",
                 'input':        "yesno",
                 'name':         _("Protect register form"),
                 'name':         _("Protect register form"),