diff --git a/RIGS/urls.py b/RIGS/urls.py index c39a571c..93028bb2 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -145,8 +145,8 @@ urlpatterns = patterns('', url(r'^ical/(?P\d+)/(?P\w+)/rigs.ics$', api_key_required(ical.CalendarICS()), name="ics_calendar"), # API - url(r'^api/(?P\w+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"), - url(r'^api/(?P\w+)/(?P\d+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"), + url(r'^api/(?P\w+)/$', login_required(views.SecureAPIRequest.as_view()), name="api_secure"), + url(r'^api/(?P\w+)/(?P\d+)/$', login_required(views.SecureAPIRequest.as_view()), name="api_secure"), # Legacy URL's url(r'^rig/show/(?P\d+)/$', RedirectView.as_view(permanent=True,pattern_name='event_detail')), diff --git a/RIGS/views.py b/RIGS/views.py index 0894d800..ea7d2bc9 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -221,8 +221,8 @@ class SecureAPIRequest(generic.View): 'venue': 'RIGS.view_venue', 'person': 'RIGS.view_person', 'organisation': 'RIGS.view_organisation', - 'profile': None, - 'event': 'RIGS.view_event', + 'profile': 'RIGS.view_profile', + 'event': None, } ''' @@ -331,27 +331,6 @@ class SecureAPIRequest(generic.View): if item.access_at: data['access_at'] = item.access_at.strftime('%Y-%m-%dT%H:%M:%SZ') - if item.venue: - data['venue'] = item.venue.name - - if item.person: - data['person'] = item.person.name - - if item.organisation: - data['organisation'] = item.organisation.name - - if item.mic: - data['mic'] = { - 'name':item.mic.get_full_name(), - 'initials':item.mic.initials - } - - if item.description: - data['description'] = item.description - - if item.notes: - data['notes'] = item.notes - data['url'] = str(reverse_lazy('event_detail',kwargs={'pk':item.pk})) results.append(data)