diff --git a/src/camps/management/__init__.py b/src/camps/management/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/camps/management/commands/__init__.py b/src/camps/management/commands/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/utils/management/commands/createcamp.py b/src/camps/management/commands/createcamp.py similarity index 91% rename from src/utils/management/commands/createcamp.py rename to src/camps/management/commands/createcamp.py index 1b81da7c..4c55bfcc 100644 --- a/src/utils/management/commands/createcamp.py +++ b/src/camps/management/commands/createcamp.py @@ -28,9 +28,9 @@ class Command(BaseCommand): # files to create, relative to DJANGO_BASE_PATH files = [ - 'sponsors/templates/{camp_slug}-sponsors.html', - 'camps/templates/{camp_slug}-camp_detail.html', - 'program/templates/{camp_slug}-call_for_speakers.html' + 'sponsors/templates/{camp_slug}_sponsors.html', + 'camps/templates/{camp_slug}_camp_detail.html', + 'program/templates/{camp_slug}_call_for_speakers.html' ] # directories to create, relative to DJANGO_BASE_PATH diff --git a/src/camps/views.py b/src/camps/views.py index 034cd267..fce45cd0 100644 --- a/src/camps/views.py +++ b/src/camps/views.py @@ -1,6 +1,6 @@ from django.views.generic import ListView, DetailView from django.utils import timezone -from .models import * +from .models import Camp from django.shortcuts import redirect from .mixins import CampViewMixin from django.views import View @@ -10,7 +10,7 @@ logger = logging.getLogger("bornhack.%s" % __name__) class CampRedirectView(CampViewMixin, View): - logger = logging.getLogger("bornhack.%s" % __name__) + def dispatch(self, request, *args, **kwargs): # find the closest camp in the past prevcamp = Camp.objects.filter(camp__endswith__lt=timezone.now()).order_by('-camp')[0]