diff options
| -rw-r--r-- | core/migrations/0002_auto_20200617_1631.py | 34 | ||||
| -rw-r--r-- | core/views_statistics.py | 2 | ||||
| -rw-r--r-- | settings.py | 10 |
3 files changed, 42 insertions, 4 deletions
diff --git a/core/migrations/0002_auto_20200617_1631.py b/core/migrations/0002_auto_20200617_1631.py new file mode 100644 index 0000000..6a6abe4 --- /dev/null +++ b/core/migrations/0002_auto_20200617_1631.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='survexblock', + name='legsall', + field=models.IntegerField(), + ), + migrations.AlterField( + model_name='survexblock', + name='legssplay', + field=models.IntegerField(), + ), + migrations.AlterField( + model_name='survexblock', + name='legssurfc', + field=models.IntegerField(), + ), + migrations.AlterField( + model_name='survexblock', + name='totalleglength', + field=models.FloatField(), + ), + ] diff --git a/core/views_statistics.py b/core/views_statistics.py index bd71a1f..5419c66 100644 --- a/core/views_statistics.py +++ b/core/views_statistics.py @@ -51,7 +51,7 @@ def pathsreport(request): "SURVEYS" : SURVEYS, "SURVEYS_URL" : SURVEYS_URL, "SVX_URL" : SVX_URL, - "TEMPLATE_DIRS" : TEMPLATE_DIRS, +# "TEMPLATE_DIRS" : TEMPLATE_DIRS, "THREEDCACHEDIR" : THREEDCACHEDIR, # "TINY_MCE_MEDIA_ROOT" : TINY_MCE_MEDIA_ROOT, # "TINY_MCE_MEDIA_URL" : TINY_MCE_MEDIA_URL, diff --git a/settings.py b/settings.py index 5fd8346..c2fbc1f 100644 --- a/settings.py +++ b/settings.py @@ -98,17 +98,19 @@ SECRET_KEY = 'a#vaeozn0)uz_9t_%v5n#tj)m+%ace6b_0(^fj!355qki*v)j2' LOGIN_REDIRECT_URL = '/' INSTALLED_APPS = ( +# 'django.auth', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', -# 'registration', + 'registration', 'troggle.profiles', 'troggle.core', 'troggle.flatpages', -) + ) + MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', @@ -146,4 +148,6 @@ TEST_RUNNER = 'django.test.runner.DiscoverRunner' from localsettings import * #localsettings needs to take precedence. Call it to override any existing vars. -print("** finished importing troggle/settings.py") +#print("INSTALLED_APPS ",INSTALLED_APPS) + +print("++ finished importing troggle/settings.py") |