expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-04-03 09:21:48 +01:00
Code Issues 18 Projects 3 Activity

TEMPLATES done for dj 1.9.13

Browse Source
This commit is contained in:
Philip Sargent 2020-06-17 21:27:01 +01:00
parent 660479d692
commit 4941d230e2
3 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/migrations/0002_auto_20200617_1631.py Normal file
View File

@ -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(),
),
]

2
core/views_statistics.py
View File

@ -51,7 +51,7 @@ def pathsreport(request):
"SURVEYS" : SURVEYS, "SURVEYS" : SURVEYS,
"SURVEYS_URL" : SURVEYS_URL, "SURVEYS_URL" : SURVEYS_URL,
"SVX_URL" : SVX_URL, "SVX_URL" : SVX_URL,
"TEMPLATE_DIRS" : TEMPLATE_DIRS, # "TEMPLATE_DIRS" : TEMPLATE_DIRS,
"THREEDCACHEDIR" : THREEDCACHEDIR, "THREEDCACHEDIR" : THREEDCACHEDIR,
# "TINY_MCE_MEDIA_ROOT" : TINY_MCE_MEDIA_ROOT, # "TINY_MCE_MEDIA_ROOT" : TINY_MCE_MEDIA_ROOT,
# "TINY_MCE_MEDIA_URL" : TINY_MCE_MEDIA_URL, # "TINY_MCE_MEDIA_URL" : TINY_MCE_MEDIA_URL,

10
settings.py
View File

@ -98,17 +98,19 @@ SECRET_KEY = 'a#vaeozn0)uz_9t_%v5n#tj)m+%ace6b_0(^fj!355qki*v)j2'
LOGIN_REDIRECT_URL = '/' LOGIN_REDIRECT_URL = '/'
INSTALLED_APPS = ( INSTALLED_APPS = (
# 'django.auth',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
# 'registration', 'registration',
'troggle.profiles', 'troggle.profiles',
'troggle.core', 'troggle.core',
'troggle.flatpages', 'troggle.flatpages',
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
@ -146,4 +148,6 @@ TEST_RUNNER = 'django.test.runner.DiscoverRunner'
from localsettings import * from localsettings import *
#localsettings needs to take precedence. Call it to override any existing vars. #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")