pycodestyle

PyRIGS/urls.py

@@ -18,18 +18,18 @@ urlpatterns = [
     path('user/', include('django.contrib.auth.urls')),
     path('user/', include('registration.backends.default.urls')),
     path('user/register/', RegistrationView.as_view(form_class=forms.ProfileRegistrationFormUniqueEmail),
-        name="registration_register"),
+         name="registration_register"),
     path('user/login/', LoginView.as_view(authentication_form=forms.CheckApprovedForm), name='login'),
     path('user/login/embed/', xframe_options_exempt(views.LoginEmbed.as_view()), name='login_embed'),
     # User editing
     path('user/edit/', login_required(views.ProfileUpdateSelf.as_view()),
-        name='profile_update_self'),
+         name='profile_update_self'),
     path('user/reset_api_key', login_required(views.ResetApiKey.as_view(permanent=False)),
-        name='reset_api_key'),
+         name='reset_api_key'),
     path('user/', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
     path('user/<pk>/',
-        permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
+         permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
-        name='profile_detail'),
+         name='profile_detail'),
 
     path('admin/', admin.site.urls),
 ]

RIGS/urls.py

@@ -1,12 +1,11 @@
-from django.urls import path
 from django.conf.urls import url
 from django.contrib.auth.decorators import login_required
-from RIGS import models, views, rigboard, finance, ical, versioning, forms
+from django.urls import path
-from django.views.generic import RedirectView
 from django.views.decorators.clickjacking import xframe_options_exempt
-
+from django.views.generic import RedirectView
-from PyRIGS.decorators import permission_required_with_403, has_oembed
+from PyRIGS.decorators import (api_key_required, has_oembed,
-from PyRIGS.decorators import api_key_required
+                               permission_required_with_403)
+from RIGS import finance, ical, models, rigboard, versioning, views
 
 urlpatterns = [
     path('', login_required(views.Index.as_view()), name='index'),
@@ -73,19 +72,17 @@ urlpatterns = [
     url(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$',
         login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
     url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
-    path('rigboard/activity/',
+    path('rigboard/activity/', permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()),
-        permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()),
+         name='activity_table'),
-        name='activity_table'),
     path('rigboard/activity/feed/',
-        permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
+         permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
-        name='activity_feed'),
+         name='activity_feed'),
 
     path('event/<pk>/', has_oembed(oembed_view="event_oembed")(
-            rigboard.EventDetail.as_view()),
+        rigboard.EventDetail.as_view()),
-        name='event_detail'),
+         name='event_detail'),
-    url(r'^event/(?P<pk>\d+)/embed/$',
+    url(r'^event/(?P<pk>\d+)/embed/$', xframe_options_exempt(
-        xframe_options_exempt(
+        login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
-            login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
         name='event_embed'),
     url(r'^event/(?P<pk>\d+)/oembed_json/$',
         rigboard.EventOembed.as_view(),
@@ -106,7 +103,7 @@ urlpatterns = [
         permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
         name='event_duplicate'),
     path('event/archive/', login_required()(rigboard.EventArchive.as_view()),
-        name='event_archive'),
+         name='event_archive'),
 
     url(r'^event/(?P<pk>\d+)/history/$',
         permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()),
@@ -148,10 +145,10 @@ urlpatterns = [
 
     # Client event authorisation
     path('event/<pk>/auth/',
-        permission_required_with_403('RIGS.change_event')(
+         permission_required_with_403('RIGS.change_event')(
-            rigboard.EventAuthorisationRequest.as_view()
+             rigboard.EventAuthorisationRequest.as_view()
-        ),
+         ),
-        name='event_authorise_request'),
+         name='event_authorise_request'),
     url(r'^event/(?P<pk>\d+)/auth/preview/$',
         permission_required_with_403('RIGS.change_event')(
             rigboard.EventAuthoriseRequestEmailPreview.as_view()

RIGS/views.py

@@ -138,7 +138,7 @@ class PersonUpdate(generic.UpdateView):
 
 
 class OrganisationList(generic.ListView):
-    template_name='organisation_list.html'
+    template_name = 'organisation_list.html'
     model = models.Organisation
     paginate_by = 20
 
@@ -384,7 +384,7 @@ class SecureAPIRequest(generic.View):
 
 
 class ProfileDetail(generic.DetailView):
-    template_name="profile_detail.html"
+    template_name = "profile_detail.html"
     model = models.Profile
 
     def get_queryset(self):
@@ -398,7 +398,7 @@ class ProfileDetail(generic.DetailView):
 
 
 class ProfileUpdateSelf(generic.UpdateView):
-    template_name="profile_form.html"
+    template_name = "profile_form.html"
     model = models.Profile
     fields = ['first_name', 'last_name', 'email', 'initials', 'phone']