Move exemption to urls.py (cleaner)

This commit is contained in:
David Taylor
2016-10-06 13:13:09 +01:00
parent 4660322964
commit f0bb4c5b02
2 changed files with 2 additions and 7 deletions

View File

@@ -13,7 +13,6 @@ from django.core.urlresolvers import reverse
from django.http import HttpResponse
from django.db.models import Q
from django.contrib import messages
from django.views.decorators.clickjacking import xframe_options_exempt
from z3c.rml import rml2pdf
from PyPDF2 import PdfFileMerger, PdfFileReader
import simplejson
@@ -69,11 +68,6 @@ class EventOembed(generic.View):
class EventEmbed(EventDetail):
template_name = 'RIGS/event_embed.html'
@xframe_options_exempt
def get(self, request, *args, **kwargs):
return super(EventEmbed, self).get(request, *args, **kwargs)
class EventCreate(generic.CreateView):
model = models.Event
form_class = forms.EventForm

View File

@@ -2,6 +2,7 @@ from django.conf.urls import patterns, include, url
from django.contrib.auth.decorators import login_required
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 api_key_required
@@ -83,7 +84,7 @@ urlpatterns = patterns('',
permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(rigboard.EventDetail.as_view()),
name='event_detail'),
url(r'^event/(?P<pk>\d+)/embed/$',
permission_required_with_403('RIGS.view_event')(rigboard.EventEmbed.as_view()),
xframe_options_exempt(permission_required_with_403('RIGS.view_event')(rigboard.EventEmbed.as_view())),
name='event_embed'),
url(r'^event/(?P<pk>\d+)/oembed_json/$',
rigboard.EventOembed.as_view(),