Refactored views a little

misago/apps/admin/bans/views.py

@@ -17,21 +17,6 @@ def reverse(route, target=None):
 """
 Views
 """
-def error_banned(request, user=None, ban=None):
-    if not ban:
-        ban = request.ban
-    response = request.theme.render_to_response('error403_banned.html',
-                                                {
-                                                 'banned_user': user,
-                                                 'ban': ban,
-                                                 'hide_signin': True,
-                                                 'exception_response': True,
-                                                 },
-                                                context_instance=RequestContext(request));
-    response.status_code = 403
-    return response
-
-
 class List(ListWidget):
     """
     List Bans

misago/apps/admin/settings/views.py

@@ -6,7 +6,7 @@ from misago.forms import Form, FormLayout, FormFields
 from misago.messages import Message
 from misago.search import SearchQuery, SearchException
 from misago.models import SettingsGroup, Setting
-from misago.apps.views import error404
+from misago.apps.errors import error404
 from misago.apps.admin.settings.forms import SearchForm
 
 def settings(request, group_id=None, group_slug=None):

misago/apps/admin/stats/views.py

@@ -9,7 +9,7 @@ from django.utils.translation import ugettext as _
 from misago.forms import FormLayout
 from misago.messages import Message
 from misago.apps.admin.stats.forms import GenerateStatisticsForm
-from misago.apps.views import error404
+from misago.apps.errors import error404
 
 def form(request):
     """

misago/apps/views.py → misago/apps/errors.py

@@ -1,18 +1,5 @@
-from django.core.urlresolvers import reverse
-from django.shortcuts import redirect
 from django.template import RequestContext
 
-def redirect_message(request, message, type='info', owner=None):
-    """
-    Set flash message and redirect to board index.
-    """
-    request.messages.set_flash(message, type, owner)
-    return redirect(reverse('index'))
-
-
-"""
-Error views
-"""
 def error_view(request, error, message):
     response = request.theme.render_to_response(('error%s.html' % error),
                                                 {

misago/apps/signin/views.py

@@ -11,8 +11,8 @@ from misago.auth import AuthException, auth_admin, auth_forum, sign_user_in
 from misago.decorators import (block_authenticated, block_banned, block_crawlers,
                             block_guest, block_jammed, check_csrf)
 from misago.models import SignInAttempt, Token
-from misago.apps.signin.forms import SignInForm
 from misago.utils.strings import random_string
+from misago.apps.signin.forms import SignInForm
 
 @block_crawlers
 @block_banned

misago/decorators.py

@@ -1,6 +1,6 @@
 from django.utils.translation import ugettext as _
 from misago.acl.exceptions import ACLError403, ACLError404
-from misago.apps.views import error403, error404, error_banned
+from misago.apps.errors import error403, error404, error_banned
 
 def acl_errors(f):
     def decorator(*args, **kwargs):

misago/firewalls.py

@@ -2,7 +2,7 @@ from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from misago.admin import ADMIN_PATH
 from misago.messages import Message
-from misago.apps.views import error403, error404
+from misago.apps.errors import error403, error404
 from misago.apps.signin.views import signin
 
 class FirewallForum(object):

misago/urls.py

@@ -4,15 +4,14 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from misago.admin import ADMIN_PATH, site
 
 # Include frontend patterns
-urlpatterns = patterns('misago.apps.front',
+urlpatterns = patterns('misago.apps',
     url(r'^$', 'index.index', name="index"),
     url(r'^read-all/$', 'readall.read_all', name="read_all"),
+    (r'^', include('misago.apps.signin.urls')),
 )
 
-# Include shared Sign-In action
-urlpatterns += patterns('',
-    (r'^', include('misago.apps.signin.urls')),
     # Remove after ACP was refactored
+urlpatterns += patterns('',
     url(r'^users/(?P<username>\w+)-(?P<user>\d+)/$', 'misago.apps.admin.adminindex.todo', name="user"),    
 )
 
@@ -49,5 +48,5 @@ if settings.DEBUG:
     )
 
 # Set error handlers
-handler403 = 'misago.apps.views.error403'
-handler404 = 'misago.apps.views.error404'
+handler403 = 'misago.apps.errors.error403'
+handler404 = 'misago.apps.errors.error404'

misago/utils/views.py

@@ -0,0 +1,9 @@
+from django.core.urlresolvers import reverse
+from django.shortcuts import redirect
+
+def redirect_message(request, message, type='info', owner=None):
+    """
+    Set flash message and redirect to board index.
+    """
+    request.messages.set_flash(message, type, owner)
+    return redirect(reverse('index'))