arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 16:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Added archive link

Browse Source 
Added legacy redirect urls
This commit is contained in:
Tom Price
2015-01-26 16:09:22 +00:00
parent 5b1cdbf182
commit 4a908fd95f
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/rigboard.py
View File

@@ -103,7 +103,6 @@ class EventPrint(generic.View):
class EventDuplicate(generic.RedirectView): class EventDuplicate(generic.RedirectView):
def get_redirect_url(self, *args, **kwargs): def get_redirect_url(self, *args, **kwargs):
new = get_object_or_404(models.Event, pk=kwargs['pk']) new = get_object_or_404(models.Event, pk=kwargs['pk'])
new.pk = None new.pk = None
@@ -117,6 +116,7 @@ class EventDuplicate(generic.RedirectView):
return reverse_lazy('event_update', kwargs={'pk': new.pk}) return reverse_lazy('event_update', kwargs={'pk': new.pk})
class EventArchive(generic.ArchiveIndexView): class EventArchive(generic.ArchiveIndexView):
model = models.Event model = models.Event
date_field = "start_date" date_field = "start_date"
@@ -139,4 +139,4 @@ class EventArchive(generic.ArchiveIndexView):
else: else:
qs = self.model.objects.all() qs = self.model.objects.all()
return qs.select_related('person','organisation','venue','mic') return qs.select_related('person', 'organisation', 'venue', 'mic')

10
RIGS/urls.py
View File

@@ -1,6 +1,7 @@
from django.conf.urls import patterns, include, url from django.conf.urls import patterns, include, url
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from RIGS import views, rigboard from RIGS import views, rigboard
from django.views.generic import RedirectView
from PyRIGS.decorators import permission_required_with_403 from PyRIGS.decorators import permission_required_with_403
@@ -56,6 +57,8 @@ urlpatterns = patterns('',
# Rigboard # Rigboard
url(r'^rigboard/$', rigboard.RigboardIndex.as_view(), name='rigboard'), url(r'^rigboard/$', rigboard.RigboardIndex.as_view(), name='rigboard'),
url(r'^rigboard/archive/$', RedirectView.as_view(pattern_name='event_archive')),
url(r'^event/(?P<pk>\d+)/$', url(r'^event/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_event')(rigboard.EventDetail.as_view()), permission_required_with_403('RIGS.view_event')(rigboard.EventDetail.as_view()),
name='event_detail'), name='event_detail'),
@@ -76,5 +79,12 @@ urlpatterns = patterns('',
# API # API
url(r'^api/(?P<model>\w+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"), url(r'^api/(?P<model>\w+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"),
url(r'^api/(?P<model>\w+)/(?P<pk>\d+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"), url(r'^api/(?P<model>\w+)/(?P<pk>\d+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"),
# Legacy URL's
url(r'^rig/show/(?P<pk>\d+)/$', RedirectView.as_view(pattern_name='event_detail')),
url(r'^bookings/$', RedirectView.as_view(pattern_name='rigboard')),
url(r'^bookings/past/$', RedirectView.as_view(pattern_name='event_archive')),
# Calendar may have gone away, redirect to the archive for now
url(r'^rigboard/calendar/$', RedirectView.as_view(pattern_name='event_archive', permanent=False)),
) )

2
templates/base.html
View File

@@ -40,7 +40,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Rigboard<b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Rigboard<b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="{% url 'rigboard' %}">Rigboard</a></li> <li><a href="{% url 'rigboard' %}">Rigboard</a></li>
<li><a href="#">Calendar</a></li> <li><a href="{% url 'event_archive' %}">Archive</a></li>
</ul> </ul>
</li> </li>
{% if perms.RIGS.view_invoice %} {% if perms.RIGS.view_invoice %}