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

Fixed JSON

Browse Source
This commit is contained in:
David Taylor
2016-10-06 12:59:37 +01:00
parent 69b0ff9fae
commit 59efc2c485
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RIGS/rigboard.py
View File

@@ -9,6 +9,7 @@ from django.shortcuts import get_object_or_404
from django.template import RequestContext from django.template import RequestContext
from django.template.loader import get_template from django.template.loader import get_template
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse
from django.http import HttpResponse from django.http import HttpResponse
from django.db.models import Q from django.db.models import Q
from django.contrib import messages from django.contrib import messages
@@ -52,11 +53,9 @@ class EventOembed(generic.View):
model = models.Event model = models.Event
def get(self, request, pk=None): def get(self, request, pk=None):
object = get_object_or_404(self.model, pk=pk)
base_url = "https://rigs.nottinghamtec.co.uk" base_url = "https://rigs.nottinghamtec.co.uk"
full_url = base_url+str(object.get_absolute_url()) full_url = base_url+reverse('event_embed', args=[pk])
data = { data = {
'html': '<iframe src="{0}" frameborder="0" width="100%" height="300"></iframe>'.format(full_url), 'html': '<iframe src="{0}" frameborder="0" width="100%" height="300"></iframe>'.format(full_url),

2
RIGS/urls.py
View File

@@ -84,7 +84,7 @@ urlpatterns = patterns('',
name='event_detail'), name='event_detail'),
url(r'^event/(?P<pk>\d+)/embed/$', url(r'^event/(?P<pk>\d+)/embed/$',
permission_required_with_403('RIGS.view_event')(rigboard.EventEmbed.as_view()), permission_required_with_403('RIGS.view_event')(rigboard.EventEmbed.as_view()),
name='event_oembed'), name='event_embed'),
url(r'^event/(?P<pk>\d+)/oembed_json/$', url(r'^event/(?P<pk>\d+)/oembed_json/$',
rigboard.EventOembed.as_view(), rigboard.EventOembed.as_view(),
name='event_oembed'), name='event_oembed'),