Просмотр исходного кода

- Improved stopwatch
- Bugfix in forum edit

Ralfp 12 лет назад
Родитель
Сommit
322cea5557
3 измененных файлов с 12 добавлено и 6 удалено
  1. 2 1
      misago/forums/views.py
  2. 4 0
      misago/settings_base.py
  3. 6 5
      misago/stopwatch/middleware.py

+ 2 - 1
misago/forums/views.py

@@ -5,9 +5,9 @@ from django.utils.translation import ugettext as _
 from mptt.forms import TreeNodeChoiceField
 from misago.admin import site
 from misago.admin.widgets import *
-from misago.utils import slugify
 from misago.forums.forms import CategoryForm, ForumForm, RedirectForm, DeleteForm
 from misago.forums.models import Forum
+from misago.utils import slugify
 
 def reverse(route, target=None):
     if target:
@@ -263,6 +263,7 @@ class Edit(FormWidget):
     
     def submit_form(self, form, target):
         target.name = form.cleaned_data['name']
+        target.slug = slugify(form.cleaned_data['name'])
         target.set_description(form.cleaned_data['description'])
         if target.type == 'redirect':
             target.redirect = form.cleaned_data['redirect']

+ 4 - 0
misago/settings_base.py

@@ -82,6 +82,7 @@ JINJA2_EXTENSIONS = (
 
 # List of application middlewares
 MIDDLEWARE_CLASSES = (
+    'misago.stopwatch.middleware.StopwatchMiddleware',
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'misago.cookie_jar.middleware.CookieJarMiddleware',
     'misago.settings.middleware.SettingsMiddleware',
@@ -178,6 +179,9 @@ INSTALLED_APPS = (
     'misago.readstracker', # Forums and Threads reads tracker
 )
 
+# Stopwatch target file
+STOPWATCH_LOG = ''
+
 # IP's that can see debug toolbar
 INTERNAL_IPS = ('127.0.0.1', '::1')
 

+ 6 - 5
misago/stopwatch/middleware.py

@@ -1,4 +1,5 @@
-from . import Stopwatch
+from django.conf import settings
+from misago.stopwatch import Stopwatch
 
 class StopwatchMiddleware(object):
     def process_request(self, request):
@@ -7,10 +8,10 @@ class StopwatchMiddleware(object):
     def process_response(self, request, response):
         try:
             time = request.stopwatch.time()
-            import os
-            stat_file = open(os.getcwd() + os.sep + 'stopwatch.txt', 'a')
-            stat_file.write("%s s\n" % time)
-            stat_file.close()
+            if settings.STOPWATCH_LOG:
+                stat_file = open(settings.STOPWATCH_LOG, 'a')
+                stat_file.write("%s %s s\n" % (request.path_info, time))
+                stat_file.close()
         except AttributeError:
             pass
         return response