Browse Source

small update for project template and conf

Rafał Pitoń 8 years ago
parent
commit
7e17a3cf13

+ 11 - 3
misago/conf/defaults.py

@@ -34,13 +34,15 @@ _MISAGO_JS_DEBUG = False
 # Application definition
 # Application definition
 
 
 INSTALLED_APPS = (
 INSTALLED_APPS = (
-    # Load Misago's locale/templates/static
+    # Load Misago's locale/templates/static files
     'misago',
     'misago',
 
 
-    'django.contrib.admin',
     # Keep misago.users above django.contrib.auth
     # Keep misago.users above django.contrib.auth
     # so our management commands take precedence over theirs
     # so our management commands take precedence over theirs
     'misago.users',
     'misago.users',
+
+    # Django and 3rd party apps
+    'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sessions',
@@ -51,6 +53,8 @@ INSTALLED_APPS = (
     'crispy_forms',
     'crispy_forms',
     'mptt',
     'mptt',
     'rest_framework',
     'rest_framework',
+
+    # Misago apps
     'misago.admin',
     'misago.admin',
     'misago.acl',
     'misago.acl',
     'misago.core',
     'misago.core',
@@ -64,6 +68,7 @@ INSTALLED_APPS = (
 )
 )
 
 
 MIDDLEWARE_CLASSES = (
 MIDDLEWARE_CLASSES = (
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'misago.users.middleware.AvatarServerMiddleware',
     'misago.users.middleware.AvatarServerMiddleware',
     'misago.users.middleware.RealIPMiddleware',
     'misago.users.middleware.RealIPMiddleware',
     'misago.core.middleware.frontendcontext.FrontendContextMiddleware',
     'misago.core.middleware.frontendcontext.FrontendContextMiddleware',
@@ -82,7 +87,7 @@ MIDDLEWARE_CLASSES = (
     'misago.core.middleware.threadstore.ThreadStoreMiddleware',
     'misago.core.middleware.threadstore.ThreadStoreMiddleware',
 )
 )
 
 
-TEMPLATE_CONTEXT_PROCESSORS = (
+DEFAULT_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
     'django.contrib.auth.context_processors.auth',
     'django.template.context_processors.debug',
     'django.template.context_processors.debug',
     'django.template.context_processors.i18n',
     'django.template.context_processors.i18n',
@@ -351,3 +356,6 @@ DEBUG_TOOLBAR_PANELS = (
     'debug_toolbar.panels.signals.SignalsPanel',
     'debug_toolbar.panels.signals.SignalsPanel',
     'debug_toolbar.panels.logging.LoggingPanel',
     'debug_toolbar.panels.logging.LoggingPanel',
 )
 )
+
+# Show debug toolbar for localhost
+INTERNAL_IPS = ['127.0.0.1']

+ 1 - 1
misago/project_template/project_name/settings.py

@@ -102,7 +102,7 @@ TEMPLATES = [
         ],
         ],
         'APP_DIRS': True,
         'APP_DIRS': True,
         'OPTIONS': {
         'OPTIONS': {
-            'context_processors': TEMPLATE_CONTEXT_PROCESSORS,
+            'context_processors': DEFAULT_CONTEXT_PROCESSORS,
         },
         },
     },
     },
 ]
 ]

+ 8 - 4
misago/project_template/project_name/urls.py

@@ -14,7 +14,6 @@ admin.autodiscover()
 admin.site.login_form = AdminAuthenticationForm
 admin.site.login_form = AdminAuthenticationForm
 
 
 
 
-
 urlpatterns = [
 urlpatterns = [
     url(r'^', include('misago.urls', namespace='misago')),
     url(r'^', include('misago.urls', namespace='misago')),
 
 
@@ -24,13 +23,18 @@ urlpatterns = [
 
 
     # Uncomment next line if you plan to use Django admin for 3rd party apps
     # Uncomment next line if you plan to use Django admin for 3rd party apps
     #url(r'^django-admin/', include(admin.site.urls)),
     #url(r'^django-admin/', include(admin.site.urls)),
-
-    # Uncomment next line if you plan to use browseable API
-    #url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
 ]
 ]
 
 
 
 
+# If debug mode is enabled, run debug toolbar
+if settings.DEBUG:
+    import debug_toolbar
+    urlpatterns += [
+        url(r'^__debug__/', include(debug_toolbar.urls)),
+    ]
+
 
 
+# Use static file server for static and media (debug only)
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 

+ 0 - 7
misago/users/viewmodels/threads.py

@@ -34,16 +34,11 @@ class UserThreads(object):
         paginator = pagination_dict(list_page, include_page_range=False)
         paginator = pagination_dict(list_page, include_page_range=False)
 
 
         posts = list(list_page.object_list)
         posts = list(list_page.object_list)
-
-        posters = []
         threads = []
         threads = []
 
 
         for post in posts:
         for post in posts:
             threads.append(post.thread)
             threads.append(post.thread)
 
 
-            if post.poster:
-                posters.append(post.poster)
-
         add_categories_to_items(root_category.unwrap(), threads_categories, posts + threads)
         add_categories_to_items(root_category.unwrap(), threads_categories, posts + threads)
 
 
         add_acl(request.user, threads)
         add_acl(request.user, threads)
@@ -55,8 +50,6 @@ class UserThreads(object):
 
 
         add_likes_to_posts(request.user, posts)
         add_likes_to_posts(request.user, posts)
 
 
-        make_users_status_aware(request.user, posters)
-
         self._user = request.user
         self._user = request.user
 
 
         self.posts = posts
         self.posts = posts