Browse Source

change code snippets style, still for fixing issue #363

xohozu 11 years ago
parent
commit
7af7d7d674
2 changed files with 11 additions and 7 deletions
  1. 8 5
      misago/apps/admin/index.py
  2. 3 2
      misago/apps/admin/online/views.py

+ 8 - 5
misago/apps/admin/index.py

@@ -8,18 +8,21 @@ from datetime import timedelta
 
 
 
 
 def index(request):
 def index(request):
+    sessions_expiration = timezone.now() - timedelta(seconds=settings.online_counting_frequency)
+    admin_sessions = Session.objects.filter(user__isnull=False).filter(admin=1)
+    admin_sessions = admin_sessions.filter(last__gte=sessions_expiration)
+    admin_sessions = admin_sessions.order_by('user__username_slug').select_related('user')
+
     return render_to_response('index.html',
     return render_to_response('index.html',
                               {
                               {
                                   'users': monitor['users'],
                                   'users': monitor['users'],
                                   'users_inactive': monitor['users_inactive'],
                                   'users_inactive': monitor['users_inactive'],
                                   'threads': monitor['threads'],
                                   'threads': monitor['threads'],
                                   'posts': monitor['posts'],
                                   'posts': monitor['posts'],
-                                  'admins': Session.objects.filter(user__isnull=False).filter(admin=1)
-                              .filter(last__gte=timezone.now() - timedelta(seconds=settings.online_counting_frequency))
-                              .order_by('user__username_slug').select_related('user'),
+                                  'admins': admin_sessions,
                               },
                               },
-                              context_instance=RequestContext(request));
+                              context_instance=RequestContext(request))
 
 
 
 
 def todo(request, *args, **kwargs):
 def todo(request, *args, **kwargs):
-    return render_to_response('todo.html', context_instance=RequestContext(request));
+    return render_to_response('todo.html', context_instance=RequestContext(request))

+ 3 - 2
misago/apps/admin/online/views.py

@@ -44,5 +44,6 @@ class List(ListWidget):
         return items.prefetch_related('user')
         return items.prefetch_related('user')
 
 
     def select_items(self, items):
     def select_items(self, items):
-        return items.filter(matched=1).filter(admin=0).filter(
-            last__gte=timezone.now() - timedelta(seconds=settings.online_counting_frequency))
+        sessions_expiration = timezone.now() - timedelta(seconds=settings.online_counting_frequency)
+
+        return items.filter(matched=1).filter(admin=0).filter(last__gte=sessions_expiration)