From f0bb4c5b02b4304b295f7dc5785d23030972293e Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 6 Oct 2016 13:13:09 +0100 Subject: [PATCH] Move exemption to urls.py (cleaner) --- RIGS/rigboard.py | 6 ------ RIGS/urls.py | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py index d42c9fa8..91265871 100644 --- a/RIGS/rigboard.py +++ b/RIGS/rigboard.py @@ -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 diff --git a/RIGS/urls.py b/RIGS/urls.py index a2fbc7c1..beae4ec2 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -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\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\d+)/oembed_json/$', rigboard.EventOembed.as_view(),