Port to new django version - not yet fully working
- location field makes problems
This commit is contained in:
@@ -72,7 +72,7 @@
|
||||
<div class="span12">
|
||||
<div class="row copyright">
|
||||
<div class="span12">
|
||||
© 2014 Blechreiz, Martin Bauer
|
||||
© 2018 Blechreiz, Martin Bauer
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from website.views import home_view
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'$^', home_view ),
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
url(r'$^', home_view),
|
||||
]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from eventplanner.snippets import addEventCountdownForNextEventToContext, addEventRouteForNextEventToContext
|
||||
from eventplanner.models import EventParticipation
|
||||
@@ -10,11 +10,12 @@ def home_view(request):
|
||||
context = dict()
|
||||
|
||||
# Event participation for slider text
|
||||
if EventParticipation.isMember( request.user ):
|
||||
context['hasParticipationSetForAllEvents'] = EventParticipation.hasUserSetParticipationForAllEvents( request.user)
|
||||
if EventParticipation.isMember(request.user):
|
||||
context['hasParticipationSetForAllEvents'] = EventParticipation.hasUserSetParticipationForAllEvents(
|
||||
request.user)
|
||||
|
||||
addEventCountdownForNextEventToContext( context, request.user );
|
||||
addEventRouteForNextEventToContext(context, request.user, 'Conc' )
|
||||
|
||||
return render( request, 'website/mainpage.html', context )
|
||||
addEventCountdownForNextEventToContext(context, request.user)
|
||||
addEventRouteForNextEventToContext(context, request.user, 'Conc')
|
||||
|
||||
context['GOOGLE_MAPS_API_KEY'] = settings.GOOGLE_MAPS_API_KEY
|
||||
return render(request, 'website/mainpage.html', context)
|
||||
|
||||
Reference in New Issue
Block a user