Rafał Pitoń 12 лет назад
Родитель
Сommit
69659e61d0

+ 1 - 1
misago/apps/admin/stats/views.py

@@ -47,7 +47,7 @@ def form(request):
                 date_start = date_temp
             # Assert that dates are correct
             if date_end == date_start:
-                message = Message(_('Start and end date are same'), level='error')
+                message = Message(_('Start and end date are same'), 'error')
             elif check_dates(date_start, date_end, form.cleaned_data['stats_precision']):
                 message = check_dates(date_start, date_end, form.cleaned_data['stats_precision'])
             else:

+ 0 - 1
misago/apps/privatethreads/posting.py

@@ -4,7 +4,6 @@ from django.utils.translation import ugettext as _
 from misago import messages
 from misago.acl.exceptions import ACLError403, ACLError404
 from misago.apps.threadtype.posting import NewThreadBaseView, EditThreadBaseView, NewReplyBaseView, EditReplyBaseView
-from misago.messages import Message
 from misago.models import Forum, Thread, Post, User
 from misago.apps.privatethreads.forms import (NewThreadForm, EditThreadForm,
                                               NewReplyForm, EditReplyForm)

+ 0 - 1
misago/apps/readall.py

@@ -5,7 +5,6 @@ from django.utils import timezone
 from django.utils.translation import ugettext as _
 from misago import messages
 from misago.decorators import block_guest, check_csrf
-from misago.messages import Message
 from misago.models import ForumRead, ThreadRead
 
 @block_guest

+ 0 - 1
misago/apps/reports/list.py

@@ -7,7 +7,6 @@ from django.utils.translation import ugettext as _
 from misago import messages
 from misago.apps.threadtype.list import ThreadsListBaseView, ThreadsListModeration
 from misago.conf import settings
-from misago.messages import Message
 from misago.models import Forum, Thread, Post
 from misago.monitor import monitor, UpdatingMonitor
 from misago.readstrackers import ThreadsTracker

+ 0 - 1
misago/apps/reports/posting.py

@@ -3,7 +3,6 @@ from django.shortcuts import redirect
 from django.utils.translation import ugettext as _
 from misago import messages
 from misago.apps.threadtype.posting import EditThreadBaseView, NewReplyBaseView, EditReplyBaseView
-from misago.messages import Message
 from misago.models import Forum, Thread, Post
 from misago.monitor import monitor, UpdatingMonitor
 from misago.apps.reports.mixins import TypeMixin

+ 0 - 1
misago/apps/reports/thread.py

@@ -1,7 +1,6 @@
 from django.utils.translation import ugettext as _
 from misago import messages
 from misago.apps.threadtype.thread import ThreadBaseView, ThreadModeration, PostsModeration
-from misago.messages import Message
 from misago.models import Forum, Thread
 from misago.monitor import monitor, UpdatingMonitor
 from misago.apps.reports.mixins import TypeMixin

+ 0 - 1
misago/apps/threads/posting.py

@@ -3,7 +3,6 @@ from django.shortcuts import redirect
 from django.utils.translation import ugettext as _
 from misago import messages
 from misago.apps.threadtype.posting import NewThreadBaseView, EditThreadBaseView, NewReplyBaseView, EditReplyBaseView
-from misago.messages import Message
 from misago.models import Forum, Thread, Post
 from misago.apps.threads.mixins import TypeMixin
 

+ 0 - 1
misago/apps/threadtype/changelog.py

@@ -7,7 +7,6 @@ from misago import messages
 from misago.acl.exceptions import ACLError403, ACLError404
 from misago.apps.errors import error403, error404
 from misago.markdown import post_markdown
-from misago.messages import Message
 from misago.models import Forum, Thread, Post, Change
 from misago.shortcuts import render_to_response
 from misago.utils.datesformats import reldate

+ 0 - 1
misago/apps/threadtype/delete.py

@@ -5,7 +5,6 @@ from django.utils.translation import ugettext as _
 from misago import messages
 from misago.acl.exceptions import ACLError403, ACLError404
 from misago.apps.errors import error403, error404
-from misago.messages import Message
 from misago.models import Forum, Thread, Post, Checkpoint
 from misago.apps.threadtype.base import ViewBase
 

+ 0 - 1
misago/apps/threadtype/jumps.py

@@ -8,7 +8,6 @@ from misago.apps.errors import error403, error404
 from misago.conf import settings
 from misago.decorators import block_guest, check_csrf
 from misago.markdown import post_markdown
-from misago.messages import Message
 from misago.models import Forum, Checkpoint, Thread, Post, Karma, WatchedThread
 from misago.monitor import monitor, UpdatingMonitor
 from misago.readstrackers import ThreadsTracker

+ 0 - 1
misago/apps/usercp/views.py

@@ -5,7 +5,6 @@ from misago import messages
 from misago.apps.errors import error404
 from misago.apps.profiles.decorators import user_view
 from misago.decorators import block_guest, check_csrf
-from misago.messages import Message
 from misago.models import User
 from misago.utils.translation import ugettext_lazy
 

+ 2 - 3
misago/apps/watchedthreads/views.py

@@ -7,7 +7,6 @@ from django.utils.translation import ugettext as _
 from misago.apps.errors import error403
 from misago.conf import settings
 from misago.decorators import block_guest
-from misago.messages import Message
 from misago.models import Forum, WatchedThread
 from misago.shortcuts import render_to_response
 from misago.utils.pagination import make_pagination
@@ -51,9 +50,9 @@ def watched_threads(request, page=0, new=False):
     threads = []
     for thread in queryset:
         thread.thread.send_email = thread.email
-        thread.thread.is_read = thread.thread.last <= thread.last_read             
+        thread.thread.is_read = thread.thread.last <= thread.last_read
         threads.append(thread.thread)
-            
+
     # Display page
     return render_to_response('watched.html',
                               {

+ 39 - 39
misago/firewalls.py

@@ -1,39 +1,39 @@
-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.template.theme import reset_theme
-from misago.apps.errors import error403, error404
-from misago.apps.signin.views import signin
-
-class FirewallForum(object):
-    admin = False
-    prefix = ''
-
-    def behind_firewall(self, path):
-        """
-        Firewall test, it checks if requested path is behind firewall
-        """
-        return path[:len(self.prefix)] == self.prefix
-
-    def process_view(self, request, callback, callback_args, callback_kwargs):
-        return None
-
-
-class FirewallAdmin(FirewallForum):
-    admin = True
-    prefix = '/' + ADMIN_PATH
-
-    def process_view(self, request, callback, callback_args, callback_kwargs):
-        # Block all crawlers with 403
-        if request.user.is_crawler():
-            reset_theme()
-            return error403(request)
-        else:
-            # If we are not authenticated or not admin, force us to sign in right way
-            if not request.user.is_authenticated():
-                return signin(request)
-            elif not request.user.is_god() and not request.acl.special.is_admin():
-                request.messages.set_message(Message(_("Your account does not have admin privileges")), 'error', 'security')
-                return signin(request)
-            return None
+from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
+from misago import messages
+from misago.admin import ADMIN_PATH
+from misago.template.theme import reset_theme
+from misago.apps.errors import error403, error404
+from misago.apps.signin.views import signin
+
+class FirewallForum(object):
+    admin = False
+    prefix = ''
+
+    def behind_firewall(self, path):
+        """
+        Firewall test, it checks if requested path is behind firewall
+        """
+        return path[:len(self.prefix)] == self.prefix
+
+    def process_view(self, request, callback, callback_args, callback_kwargs):
+        return None
+
+
+class FirewallAdmin(FirewallForum):
+    admin = True
+    prefix = '/' + ADMIN_PATH
+
+    def process_view(self, request, callback, callback_args, callback_kwargs):
+        # Block all crawlers with 403
+        if request.user.is_crawler():
+            reset_theme()
+            return error403(request)
+        else:
+            # If we are not authenticated or not admin, force us to sign in right way
+            if not request.user.is_authenticated():
+                return signin(request)
+            elif not request.user.is_god() and not request.acl.special.is_admin():
+                request.messages.set_message(_("Your account does not have admin privileges"), messages.ERROR, 'security')
+                return signin(request)
+            return None

+ 2 - 2
misago/middleware/user.py

@@ -1,7 +1,7 @@
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
+from misago import messages
 from misago.conf import settings
-from misago.messages import Message
 from misago.monitor import monitor, UpdatingMonitor
 from misago.onlines import MembersOnline
 
@@ -20,7 +20,7 @@ class UserMiddleware(object):
             request.session.rank = request.user.rank_id
             set_timezone(request.user.timezone)
             if request.session.remember_me:
-                request.messages.set_message(Message(_("Welcome back, %(username)s! We've signed you in automatically for your convenience.") % {'username': request.user.username}), 'info')
+                request.messages.set_message(_("Welcome back, %(username)s! We've signed you in automatically for your convenience.") % {'username': request.user.username})
         else:
             set_timezone(settings.default_timezone)
             request.session.rank = None