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

Merge branch 'master' into search

Browse Source 
# Conflicts:
#	RIGS/templates/RIGS/index.html
This commit is contained in:
FreneticScribbler
2020-02-29 11:47:35 +00:00
parent 3a7dc061bb 4a4d4a5cf3
commit 4f088fb426
19 changed files with 194 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RIGS/urls.py
View File

@@ -6,7 +6,7 @@ from RIGS import models, views, rigboard, finance, ical, versioning, forms
from django.views.generic import RedirectView
from django.views.decorators.clickjacking import xframe_options_exempt
from PyRIGS.decorators import permission_required_with_403
from PyRIGS.decorators import permission_required_with_403, has_oembed
from PyRIGS.decorators import api_key_required
urlpatterns = [
@@ -89,8 +89,7 @@ urlpatterns = [
permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
name='activity_feed'),
url(r'^event/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(
url(r'^event/(?P<pk>\d+)/$', has_oembed(oembed_view="event_oembed")(
rigboard.EventDetail.as_view()),
name='event_detail'),
url(r'^event/(?P<pk>\d+)/embed/$',