arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-24 17:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge conflict from master

Browse Source
This commit is contained in:
Tom Price
2015-04-21 19:57:45 +01:00
parent 98f0005d67 ef1e4bc9a5
commit 3b1137c2d6
15 changed files with 12358 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/urls.py
View File

@@ -58,6 +58,7 @@ urlpatterns = patterns('',
# Rigboard
url(r'^rigboard/$', rigboard.RigboardIndex.as_view(), name='rigboard'),
url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
url(r'^rigboard/archive/$', RedirectView.as_view(pattern_name='event_archive')),
url(r'^event/(?P<pk>\d+)/$',
@@ -127,8 +128,5 @@ urlpatterns = patterns('',
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)),
)