Fix bug reported by Oscar Frias on http://jira.osqa.net/browse/OSQA-173

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
old mode 100755 (executable)
new mode 100644 (file)
index 4188e05..1f88d7b
--- a/settings.py
+++ b/settings.py
@@ -5,7 +5,7 @@ import sys
 
 SITE_ID = 1
 
 
 SITE_ID = 1
 

-ADMIN_MEDIA_PREFIX = '/forum/admin/media/'
+ADMIN_MEDIA_PREFIX = '/admin_media/'

 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (


@@ -23,19 +23,18 @@ MIDDLEWARE_CLASSES = [
     #'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     #'django.middleware.cache.FetchFromCacheMiddleware',
     #'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     #'django.middleware.cache.FetchFromCacheMiddleware',

-    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'forum.middleware.extended_user.ExtendedUser',

     #'django.middleware.sqlprint.SqlPrintingMiddleware',
     'forum.middleware.anon_user.ConnectToSessionMessagesMiddleware',
     #'django.middleware.sqlprint.SqlPrintingMiddleware',
     'forum.middleware.anon_user.ConnectToSessionMessagesMiddleware',

-    'forum.middleware.pagesize.QuestionsPageSizeMiddleware',
+    'forum.middleware.request_utils.RequestUtils',

     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.cancel.CancelActionMiddleware',

-    'debug_toolbar.middleware.DebugToolbarMiddleware',
-    'recaptcha_django.middleware.ReCaptchaMiddleware',
+    #'recaptcha_django.middleware.ReCaptchaMiddleware',

     'django.middleware.transaction.TransactionMiddleware',
 ]
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'django.middleware.transaction.TransactionMiddleware',
 ]
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',

-    'context.application_settings',
+    'forum.context.application_settings',

     #'django.core.context_processors.i18n',
     'forum.user_messages.context_processors.user_messages',#must be before auth
     'django.core.context_processors.auth', #this is required for admin
     #'django.core.context_processors.i18n',
     'forum.user_messages.context_processors.user_messages',#must be before auth
     'django.core.context_processors.auth', #this is required for admin


@@ -68,34 +67,22 @@ INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.humanize',
     'django.contrib.sitemaps',
     'django.contrib.admin',
     'django.contrib.humanize',
     'django.contrib.sitemaps',

+    'django.contrib.markup',

     'forum',
     'forum',

-    #'django_authopenid',
-    'debug_toolbar' ,

 ]
 
 ]
 

-AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend',]
-
-if USE_SPHINX_SEARCH:
-    INSTALLED_APPS.append('djangosphinx')
-
-if USE_FB_CONNECT:
-    INSTALLED_APPS.append('fbconnect')
+if DEBUG:
+    try:
+        import debug_toolbar
+        MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware')
+        INSTALLED_APPS.append('debug_toolbar')
+    except:
+        pass

 
 

-if DATABASE_ENGINE in ('postgresql_psycopg2', 'postgresql', ) and False:
-    USE_PG_FTS = True
-    INSTALLED_APPS.append('pgfulltext')
-else:
-    USE_PG_FTS = False
+try:
+    import south
+    INSTALLED_APPS.append('south')
+except:
+    pass

 
 

-#load optional plugin module for external password login
-if 'USE_EXTERNAL_LEGACY_LOGIN' in locals() and USE_EXTERNAL_LEGACY_LOGIN:
-    INSTALLED_APPS.append(EXTERNAL_LEGACY_LOGIN_MODULE)
-
-    if 'EXTERNAL_LEGACY_LOGIN_AUTHENTICATION_BACKEND' in locals():
-        AUTHENTICATION_BACKENDS.append(EXTERNAL_LEGACY_LOGIN_AUTHENTICATION_BACKEND)
-    if 'EXTERNAL_LEGACY_LOGIN_AUTHENTICATION_MIDDLEWARE' in locals():
-        MIDDLEWARE_CLASSES.append(EXTERNAL_LEGACY_LOGIN_AUTHENTICATION_MIDDLEWARE)
-    def LOAD_EXTERNAL_LOGIN_APP():
-        return __import__(EXTERNAL_LEGACY_LOGIN_MODULE, [], [], ['api','forms','views'])
-else:
-    LOAD_EXTERNAL_LOGIN_APP = lambda: None
+AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend',]