#OSQA-603, removing the previously added in commit 857 call to the save method. It...

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index 61c47a8279411bc8370c6baffba665e1960ec291..de55240cddc405043605566ad30ec53675b33c6c 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -22,7 +22,6 @@ MIDDLEWARE_CLASSES = [
     'forum.middleware.request_utils.RequestUtils',
     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.admin_messages.AdminMessagesMiddleware',
     'forum.middleware.request_utils.RequestUtils',
     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.admin_messages.AdminMessagesMiddleware',

-    #'recaptcha_django.middleware.ReCaptchaMiddleware',

     'django.middleware.transaction.TransactionMiddleware',
 ]
 
     'django.middleware.transaction.TransactionMiddleware',
 ]
 


@@ -72,17 +71,25 @@ for path in app_url_split[1].split('/')[1:]:
 if FORCE_SCRIPT_NAME.endswith('/'):
     FORCE_SCRIPT_NAME = FORCE_SCRIPT_NAME[:-1]
 
 if FORCE_SCRIPT_NAME.endswith('/'):
     FORCE_SCRIPT_NAME = FORCE_SCRIPT_NAME[:-1]
 

-from forum import modules
+#Module system initialization
+MODULES_PACKAGE = 'forum_modules'
+MODULES_FOLDER = os.path.join(SITE_SRC_ROOT, MODULES_PACKAGE)

 
 

-modules.init_modules_engine(SITE_SRC_ROOT, DISABLED_MODULES)
+MODULE_LIST = filter(lambda m: getattr(m, 'CAN_USE', True), [
+        __import__('forum_modules.%s' % f, globals(), locals(), ['forum_modules'])
+        for f in os.listdir(MODULES_FOLDER)
+        if os.path.isdir(os.path.join(MODULES_FOLDER, f)) and
+           os.path.exists(os.path.join(MODULES_FOLDER, "%s/__init__.py" % f)) and
+           not f in DISABLED_MODULES
+])

 
 [MIDDLEWARE_CLASSES.extend(
         ["%s.%s" % (m.__name__, mc) for mc in getattr(m, 'MIDDLEWARE_CLASSES', [])]
 
 [MIDDLEWARE_CLASSES.extend(
         ["%s.%s" % (m.__name__, mc) for mc in getattr(m, 'MIDDLEWARE_CLASSES', [])]

-                          ) for m in modules.MODULE_LIST]
+                          ) for m in MODULE_LIST]

 
 [TEMPLATE_LOADERS.extend(
         ["%s.%s" % (m.__name__, tl) for tl in getattr(m, 'TEMPLATE_LOADERS', [])]
 
 [TEMPLATE_LOADERS.extend(
         ["%s.%s" % (m.__name__, tl) for tl in getattr(m, 'TEMPLATE_LOADERS', [])]

-                          ) for m in modules.MODULE_LIST]
+                          ) for m in MODULE_LIST]

 
 
 INSTALLED_APPS = [
 
 
 INSTALLED_APPS = [