CAMP/camp
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'camp/master'

Browse Source
This commit is contained in:
j 2018-08-21 14:23:19 +02:00
commit 480cb4afe5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/templates/base.html
View File

@ -24,7 +24,7 @@
<li><a href="/about">ABOUT</a></li> <li><a href="/about">ABOUT</a></li>
{% available_content as sections %} {% available_content as sections %}
{% for url, title in sections %} {% for url, title in sections %}
<li><a href="{{url}}">{{title}}</a></li> <li><a href="{{url}}index/">{{title}}</a></li>
{% endfor %} {% endfor %}
<li><a href="/contact">CONTACT</a></li> <li><a href="/contact">CONTACT</a></li>
</ul> </ul>

5
content/views.py
View File

@ -135,6 +135,7 @@ def render_content(request, shortname, section, template, types):
return event(request) return event(request)
else: else:
return section_index(request, section) return section_index(request, section)
shortname = shortname.replace(' ', '_')
content = get_object_or_404(Content, shortname=shortname, type__name__in=types) content = get_object_or_404(Content, shortname=shortname, type__name__in=types)
if not content.published and not request.user.is_staff: if not content.published and not request.user.is_staff:
raise Http404 raise Http404
@ -242,9 +243,9 @@ def redirect_index(request):
return redirect(reverse('index')) return redirect(reverse('index'))
def redirect_event(request): def redirect_event(request):
shortname = request.GET.get('this') shortname = request.GET.get('this').replace(' ', '_').lower()
if shortname: if shortname:
content = get_object_or_404(Content, shortname=shortname) content = get_object_or_404(Content, shortname__iexact=shortname)
return redirect(content.get_absolute_url()) return redirect(content.get_absolute_url())
id = request.GET.get('id') id = request.GET.get('id')
if id: if id: