arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-20 23:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Migrate user urls to PyRIGS module

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-10 14:08:47 +00:00
parent b57716f7fc
commit fe71f7640f
4 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PyRIGS/urls.py
View File

@@ -2,24 +2,36 @@ from django.urls import path
from django.conf.urls import include, url from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.contrib.auth.decorators import login_required
from django.conf import settings from django.conf import settings
from django.views.decorators.clickjacking import xframe_options_exempt
from django.contrib.auth.views import LoginView
from registration.backends.default.views import RegistrationView from registration.backends.default.views import RegistrationView
from PyRIGS.decorators import permission_required_with_403
import RIGS import RIGS
from RIGS import regbackend from RIGS import regbackend, forms, views
urlpatterns = [ urlpatterns = [
# Examples: path('', include('RIGS.urls')),
# url(r'^$', 'PyRIGS.views.home', name='home'), path('assets/', include('assets.urls')),
# url(r'^blog/', include('blog.urls')),
url(r'^', include('RIGS.urls')), path('user/register/', RegistrationView.as_view(form_class=forms.ProfileRegistrationFormUniqueEmail),
url('^assets/', include('assets.urls')),
url('^user/register/$', RegistrationView.as_view(form_class=RIGS.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/', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
path('user/<pk>/',
permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
name='profile_detail'),
path('user/edit/', login_required(views.ProfileUpdateSelf.as_view()),
name='profile_update_self'),
path('user/reset_api_key', login_required(views.ResetApiKey.as_view(permanent=False)),
name='reset_api_key'),
path('user/', include('django.contrib.auth.urls')), path('user/', include('django.contrib.auth.urls')),
path('user/', include('registration.backends.default.urls')), path('user/', include('registration.backends.default.urls')),
url(r'^admin/', admin.site.urls), path('admin/', admin.site.urls),
] ]
if settings.DEBUG: if settings.DEBUG:

5
RIGS/static/js/all.js Normal file
View File

File diff suppressed because one or more lines are too long

21
RIGS/urls.py
View File

@@ -1,9 +1,6 @@
from django.urls import path from django.urls import path
from django.conf.urls import url from django.conf.urls import url
from django.contrib.auth.views import PasswordResetView
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.auth.views import LoginView
from RIGS import models, views, rigboard, finance, ical, versioning, forms from RIGS import models, views, rigboard, finance, ical, versioning, forms
from django.views.generic import RedirectView from django.views.generic import RedirectView
from django.views.decorators.clickjacking import xframe_options_exempt from django.views.decorators.clickjacking import xframe_options_exempt
@@ -12,15 +9,9 @@ from PyRIGS.decorators import permission_required_with_403, has_oembed
from PyRIGS.decorators import api_key_required from PyRIGS.decorators import api_key_required
urlpatterns = [ urlpatterns = [
# Examples: path('', login_required(views.Index.as_view()), name='index'),
# url(r'^$', 'PyRIGS.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
url('^$', login_required(views.Index.as_view()), name='index'),
url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'), url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'),
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'),
url(r'^search_help/$', views.SearchHelp.as_view(), name='search_help'), url(r'^search_help/$', views.SearchHelp.as_view(), name='search_help'),
# People # People
@@ -169,16 +160,6 @@ urlpatterns = [
url(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(), url(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
name='event_authorise'), name='event_authorise'),
# User editing
url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
url(r'^user/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
name='profile_detail'),
url(r'^user/edit/$', login_required(views.ProfileUpdateSelf.as_view()),
name='profile_update_self'),
url(r'^user/reset_api_key$', login_required(views.ResetApiKey.as_view(permanent=False)),
name='reset_api_key'),
# ICS Calendar - API key authentication # ICS Calendar - API key authentication
url(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()), url(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()),
name="ics_calendar"), name="ics_calendar"),

0
RIGS/templates/admin_associate_merge.html → templates/admin_associate_merge.html
View File