From 89ba4e0652ec517385c6b997e64109935d5cc73c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 15 Jan 2012 20:48:15 -0300 Subject: fixed bugs in the settings.py templates --- askbot/setup_templates/settings.py | 2 +- askbot/setup_templates/settings.py.mustache | 6 +++--- askbot/startup_procedures.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 00bbcc11..34fba64d 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -9,7 +9,7 @@ import site ASKBOT_ROOT = os.path.abspath(os.path.dirname(askbot.__file__)) site.addsitedir(os.path.join(ASKBOT_ROOT, 'deps')) -DEBUG = False#set to True to enable debugging +DEBUG = True#set to True to enable debugging TEMPLATE_DEBUG = False#keep false when debugging jinja2 templates INTERNAL_IPS = ('127.0.0.1',) diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index d231bf64..b9a52d16 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -6,10 +6,10 @@ import askbot import site #this line is added so that we can import pre-packaged askbot dependencies -ASKBOT_ROOT = os.path.abspath(os.path.dirname(askbot.__file__) +ASKBOT_ROOT = os.path.abspath(os.path.dirname(askbot.__file__)) site.addsitedir(os.path.join(ASKBOT_ROOT, 'deps')) -DEBUG = False#set to True to enable debugging +DEBUG = True#set to True to enable debugging TEMPLATE_DEBUG = False#keep false when debugging jinja2 templates INTERNAL_IPS = ('127.0.0.1',) @@ -80,7 +80,7 @@ STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static') # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. # Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = STATIC_ROOT + 'admin/' +ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' # Make up some unique string, and don't share it with anybody. SECRET_KEY = 'sdljdfjkldsflsdjkhsjkldgjlsdgfs s ' diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py index 691f0a03..88b717bc 100644 --- a/askbot/startup_procedures.py +++ b/askbot/startup_procedures.py @@ -376,7 +376,7 @@ def test_staticfiles(): ' python manage.py collectstatic\n' ) print_errors(errors) - if django_settings.DEBUG and django_settings.STATICFILES_STORAGE != \ + if django_settings.DEBUG and django_settings.STATICFILES_STORAGE == \ 'django.contrib.staticfiles.storage.StaticFilesStorage': if not os.path.isdir(django_settings.STATIC_ROOT): askbot_warning( -- cgit v1.2.3-1-g7c22