arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-30 11:52:17 +00:00
Code Issues Projects Releases Wiki Activity

pycodestyle

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-16 21:19:09 +00:00
parent c1d277be9c
commit e0e4e8d11e
3 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
RIGS/urls.py
View File

@@ -1,12 +1,11 @@
from django.urls import path
from django.conf.urls import url from django.conf.urls import url
from django.contrib.auth.decorators import login_required 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.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 = [ urlpatterns = [
path('', login_required(views.Index.as_view()), name='index'), path('', login_required(views.Index.as_view()), name='index'),
@@ -73,8 +72,7 @@ urlpatterns = [
url(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$', 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'), login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')), 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/', 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()),
@@ -83,8 +81,7 @@ urlpatterns = [
path('event/<pk>/', has_oembed(oembed_view="event_oembed")( 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'), name='event_embed'),
url(r'^event/(?P<pk>\d+)/oembed_json/$', url(r'^event/(?P<pk>\d+)/oembed_json/$',

6
RIGS/views.py
View File

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