From c73750f28a472ed07d182646767e89f5fc4c0a5b Mon Sep 17 00:00:00 2001 From: my_webapp user account Date: Sat, 23 Sep 2017 10:43:01 +0200 Subject: [PATCH] added needed settings + fix missing import --- app_settings.py | 5 +++++ core/models.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app_settings.py b/app_settings.py index 5c84d0d..9ffce9c 100644 --- a/app_settings.py +++ b/app_settings.py @@ -1,3 +1,4 @@ +from app.settings import * INSTALLED_APPS += [ 'bootstrap4', @@ -16,3 +17,7 @@ BOOTSTRAP4 = { 'crossorigin': 'anonymous', } } + +STATIC_URL = "/cresus/static/" +STATIC_ROOT = os.path.join(BASE_DIR, "static/") +FORCE_SCRIPT_NAME = "/cresus" diff --git a/core/models.py b/core/models.py index 02be1d7..d14b166 100644 --- a/core/models.py +++ b/core/models.py @@ -1,5 +1,6 @@ import datetime from collections import defaultdict +from django.utils import timezone as tz from django.db import models # Create your models here. @@ -66,7 +67,6 @@ both 'month' and 'year' keyword arguments") qs = self.get_queryset(month=month, year=year) data = self.calculate_data(qs) - print(qs, data) return qs, data