From b47c6e14fa0b5758c7110e1934e494df99add30e Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 12 Sep 2014 22:10:37 +0200 Subject: [PATCH] Base structure for event-specific control --- src/tixlcontrol/middleware.py | 3 +++ .../templates/tixlcontrol/event/base.html | 20 +++++++++++++++++++ .../templates/tixlcontrol/event/index.html | 6 ++++++ src/tixlcontrol/views/event.py | 2 +- 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/tixlcontrol/templates/tixlcontrol/event/base.html create mode 100644 src/tixlcontrol/templates/tixlcontrol/event/index.html diff --git a/src/tixlcontrol/middleware.py b/src/tixlcontrol/middleware.py index d7e73751c0..6bfff35b6b 100644 --- a/src/tixlcontrol/middleware.py +++ b/src/tixlcontrol/middleware.py @@ -5,6 +5,7 @@ from django.utils.six.moves.urllib.parse import urlparse from django.shortcuts import resolve_url from django.contrib.auth import REDIRECT_FIELD_NAME from django.http import HttpResponseNotFound +from django.utils.translation import ugettext as _ from tixlbase.models import Event @@ -45,6 +46,8 @@ class PermissionMiddleware: return redirect_to_login( path, resolved_login_url, REDIRECT_FIELD_NAME) + request.user.events_cache = request.user.events.order_by( + "organizer", "date_from").prefetch_related("organizer") if 'event.' in url_name and 'event' in url.kwargs: try: request.event = Event.objects.get( diff --git a/src/tixlcontrol/templates/tixlcontrol/event/base.html b/src/tixlcontrol/templates/tixlcontrol/event/base.html new file mode 100644 index 0000000000..5b5d130e31 --- /dev/null +++ b/src/tixlcontrol/templates/tixlcontrol/event/base.html @@ -0,0 +1,20 @@ +{% extends "tixlcontrol/base.html" %} +{% load i18n %} + +{% block nav %} + +
  • {% trans "Dashboard" %}
  • +
  • {% trans "Settings" %}
  • +{% endblock %} diff --git a/src/tixlcontrol/templates/tixlcontrol/event/index.html b/src/tixlcontrol/templates/tixlcontrol/event/index.html new file mode 100644 index 0000000000..c79804e8df --- /dev/null +++ b/src/tixlcontrol/templates/tixlcontrol/event/index.html @@ -0,0 +1,6 @@ +{% extends "tixlcontrol/event/base.html" %} +{% load i18n %} +{% block title %}{{ request.event.name }}{% endblock %} +{% block content %} +

    {{ request.event.name }}

    +{% endblock %} diff --git a/src/tixlcontrol/views/event.py b/src/tixlcontrol/views/event.py index a2b104e5ee..f9d6916ab6 100644 --- a/src/tixlcontrol/views/event.py +++ b/src/tixlcontrol/views/event.py @@ -2,4 +2,4 @@ from django.shortcuts import render def index(request, event): - pass + return render(request, 'tixlcontrol/event/index.html', {})