Commit 7e698944 authored by matjaz's avatar matjaz
Browse files

Reconstructed variable INSTALLED_APPS mothra/settings.py - the workflows sub...

Reconstructed variable INSTALLED_APPS mothra/settings.py - the workflows sub applications are added only in one place not in two. Preparation for automatic adding.
parent c28348f3
......@@ -159,55 +159,45 @@ except NameError:
from local_settings import *
except ImportError:
pass
if USE_CONCURRENCY:
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'south',
'workflows',
'workflows.latino',
'workflows.decision_support',
'workflows.bioinformatics',
'workflows.subgroup_discovery',
'workflows.nlp',
'website',
'signuplogin',
'django_extensions',
'django.contrib.humanize',
'orderable_inlines',
INSTALLED_APPS_DEFAULT = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'south',
'website',
'signuplogin',
'django_extensions',
'django.contrib.humanize',
'orderable_inlines',
'workflows',
)
INSTALLED_APPS_CONCUR = (
'djcelery',
)
else:
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'south',
'workflows',
'workflows.latino',
'workflows.decision_support',
'workflows.bioinformatics',
'workflows.subgroup_discovery',
'workflows.nlp',
'workflows.base',
'website',
'signuplogin',
'django_extensions',
'django.contrib.humanize',
'orderable_inlines',
) if USE_CONCURRENCY else (
'streams',
)
)
INSTALLED_APPS_WORKFLOWS_SUB = (
'workflows.base',
'workflows.latino',
'workflows.decision_support',
'workflows.bioinformatics',
'workflows.subgroup_discovery',
'workflows.nlp',
#WORKFLOWS_SUBAPP_PLACEHOLDER
)
INSTALLED_APPS = \
INSTALLED_APPS_DEFAULT +\
INSTALLED_APPS_CONCUR +\
INSTALLED_APPS_WORKFLOWS_SUB
TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS
TEMPLATES_FOLDER = os.path.join(PROJECT_DIR, 'templates')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment