Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 12:30:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch to path, use re_path only when really needed

Browse Source
This commit is contained in:
Peter Pfeufer 2022-02-02 15:09:48 +01:00
parent fd442a5735
commit 640a21e4db
No known key found for this signature in database
GPG Key ID: 6051D2C6AD4EBC27
24 changed files with 187 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
allianceauth/authentication/hmac_urls.py
View File

@ -2,14 +2,15 @@ from django.conf.urls import include
from allianceauth.authentication import views from allianceauth.authentication import views
from django.urls import re_path from django.urls import re_path
from django.urls import path
urlpatterns = [ urlpatterns = [
re_path(r'^activate/complete/$', views.activation_complete, name='registration_activation_complete'), path(r'^activate/complete/$', views.activation_complete, name='registration_activation_complete'),
# The activation key can make use of any character from the # The activation key can make use of any character from the
# URL-safe base64 alphabet, plus the colon as a separator. # URL-safe base64 alphabet, plus the colon as a separator.
re_path(r'^activate/(?P<activation_key>[-:\w]+)/$', views.ActivationView.as_view(), name='registration_activate'), re_path(r'^activate/(?P<activation_key>[-:\w]+)/$', views.ActivationView.as_view(), name='registration_activate'),
re_path(r'^register/$', views.RegistrationView.as_view(), name='registration_register'), path('register/', views.RegistrationView.as_view(), name='registration_register'),
re_path(r'^register/complete/$', views.registration_complete, name='registration_complete'), path('register/complete/', views.registration_complete, name='registration_complete'),
re_path(r'^register/closed/$', views.registration_closed, name='registration_disallowed'), path('register/closed/', views.registration_closed, name='registration_disallowed'),
re_path(r'', include('django.contrib.auth.urls')), path('', include('django.contrib.auth.urls')),
] ]

19
allianceauth/authentication/urls.py
View File

@ -1,5 +1,4 @@
from django.contrib.auth.decorators import login_required from django.urls import path
from django.urls import re_path
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
from . import views from . import views
@ -7,21 +6,21 @@ from . import views
app_name = 'authentication' app_name = 'authentication'
urlpatterns = [ urlpatterns = [
re_path(r'^$', views.index, name='index'), path('', views.index, name='index'),
re_path( path(
r'^account/login/$', 'account/login/',
TemplateView.as_view(template_name='public/login.html'), TemplateView.as_view(template_name='public/login.html'),
name='login' name='login'
), ),
re_path( path(
r'^account/characters/main/$', 'account/characters/main/',
views.main_character_change, views.main_character_change,
name='change_main_character' name='change_main_character'
), ),
re_path( path(
r'^account/characters/add/$', 'account/characters/add/',
views.add_character, views.add_character,
name='add_character' name='add_character'
), ),
re_path(r'^dashboard/$', views.dashboard, name='dashboard'), path('dashboard/', views.dashboard, name='dashboard'),
] ]

14
allianceauth/corputils/urls.py
View File

@ -1,11 +1,11 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
app_name = 'corputils' app_name = 'corputils'
urlpatterns = [ urlpatterns = [
re_path(r'^$', views.corpstats_view, name='view'), path('', views.corpstats_view, name='view'),
re_path(r'^add/$', views.corpstats_add, name='add'), path('add/', views.corpstats_add, name='add'),
re_path(r'^(?P<corp_id>(\d)*)/$', views.corpstats_view, name='view_corp'), path('<int:corp_id>/', views.corpstats_view, name='view_corp'),
re_path(r'^(?P<corp_id>(\d)+)/update/$', views.corpstats_update, name='update'), path('<int:corp_id>/update/', views.corpstats_update, name='update'),
re_path(r'^search/$', views.corpstats_search, name='search'), path('search/', views.corpstats_search, name='search'),
] ]

26
allianceauth/fleetactivitytracking/urls.py
View File

@ -1,30 +1,30 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
app_name = 'fleetactivitytracking' app_name = 'fleetactivitytracking'
urlpatterns = [ urlpatterns = [
# FleetActivityTracking (FAT) # FleetActivityTracking (FAT)
re_path(r'^$', views.fatlink_view, name='view'), path('', views.fatlink_view, name='view'),
re_path(r'^statistics/$', views.fatlink_statistics_view, name='statistics'), path('statistics/', views.fatlink_statistics_view, name='statistics'),
re_path(r'^statistics/corp/(\w+)$', views.fatlink_statistics_corp_view, path('statistics/corp/<int:corpid>/', views.fatlink_statistics_corp_view,
name='statistics_corp'), name='statistics_corp'),
re_path(r'^statistics/corp/(?P<corpid>\w+)/(?P<year>[0-9]+)/(?P<month>[0-9]+)/', path('statistics/corp/<int:corpid>/<int:year>/<int:month>/',
views.fatlink_statistics_corp_view, views.fatlink_statistics_corp_view,
name='statistics_corp_month'), name='statistics_corp_month'),
re_path(r'^statistics/(?P<year>[0-9]+)/(?P<month>[0-9]+)/$', views.fatlink_statistics_view, path('statistics/<int:year>/<int:month>/', views.fatlink_statistics_view,
name='statistics_month'), name='statistics_month'),
re_path(r'^user/statistics/$', views.fatlink_personal_statistics_view, path('user/statistics/', views.fatlink_personal_statistics_view,
name='personal_statistics'), name='personal_statistics'),
re_path(r'^user/statistics/(?P<year>[0-9]+)/$', views.fatlink_personal_statistics_view, path('user/statistics/<int:year>/', views.fatlink_personal_statistics_view,
name='personal_statistics_year'), name='personal_statistics_year'),
re_path(r'^user/statistics/(?P<year>[0-9]+)/(?P<month>[0-9]+)/$', path('user/statistics/<int:year>/<int:month>/',
views.fatlink_monthly_personal_statistics_view, views.fatlink_monthly_personal_statistics_view,
name='personal_statistics_month'), name='personal_statistics_month'),
re_path(r'^user/(?P<char_id>[0-9]+)/statistics/(?P<year>[0-9]+)/(?P<month>[0-9]+)/$', path('user/<int:char_id>/statistics/<int:year>/<int:month>/',
views.fatlink_monthly_personal_statistics_view, views.fatlink_monthly_personal_statistics_view,
name='user_statistics_month'), name='user_statistics_month'),
re_path(r'^create/$', views.create_fatlink_view, name='create'), path('create/', views.create_fatlink_view, name='create'),
re_path(r'^modify/(?P<fat_hash>[a-zA-Z0-9_-]+)/$', views.modify_fatlink_view, name='modify'), path('modify/<str:fat_hash>/', views.modify_fatlink_view, name='modify'),
re_path(r'^link/(?P<fat_hash>[a-zA-Z0-9]+)/$', views.click_fatlink_view, name='click'), path('link/<str:fat_hash>/', views.click_fatlink_view, name='click'),
] ]

42
allianceauth/groupmanagement/urls.py
View File

@ -1,50 +1,50 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
app_name = "groupmanagement" app_name = "groupmanagement"
urlpatterns = [ urlpatterns = [
# groups # groups
re_path(r"^groups/$", views.groups_view, name="groups"), path("groups", views.groups_view, name="groups"),
re_path(r"^group/request/join/(\w+)/$", views.group_request_add, name="request_add"), path("group/request/join/<int:group_id>/", views.group_request_add, name="request_add"),
re_path( path(
r"^group/request/leave/(\w+)/$", views.group_request_leave, name="request_leave" "group/request/leave/<int:group_id>/", views.group_request_leave, name="request_leave"
), ),
# group management # group management
re_path(r"^groupmanagement/requests/$", views.group_management, name="management"), path("groupmanagement/requests/", views.group_management, name="management"),
re_path(r"^groupmanagement/membership/$", views.group_membership, name="membership"), path("groupmanagement/membership/", views.group_membership, name="membership"),
re_path( path(
r"^groupmanagement/membership/(\w+)/$", "groupmanagement/membership/<int:group_id>/",
views.group_membership_list, views.group_membership_list,
name="membership", name="membership",
), ),
re_path( path(
r"^groupmanagement/membership/(\w+)/audit-log/$", "groupmanagement/membership/<int:group_id>/audit-log/",
views.group_membership_audit, views.group_membership_audit,
name="audit_log", name="audit_log",
), ),
re_path( path(
r"^groupmanagement/membership/(\w+)/remove/(\w+)/$", "groupmanagement/membership/<int:group_id>/remove/<int:user_id>/",
views.group_membership_remove, views.group_membership_remove,
name="membership_remove", name="membership_remove",
), ),
re_path( path(
r"^groupmanagement/request/join/accept/(\w+)/$", "groupmanagement/request/join/accept/<int:group_request_id>/",
views.group_accept_request, views.group_accept_request,
name="accept_request", name="accept_request",
), ),
re_path( path(
r"^groupmanagement/request/join/reject/(\w+)/$", "groupmanagement/request/join/reject/<int:group_request_id>/",
views.group_reject_request, views.group_reject_request,
name="reject_request", name="reject_request",
), ),
re_path( path(
r"^groupmanagement/request/leave/accept/(\w+)/$", "groupmanagement/request/leave/accept/<int:group_request_id>/",
views.group_leave_accept_request, views.group_leave_accept_request,
name="leave_accept_request", name="leave_accept_request",
), ),
re_path( path(
r"^groupmanagement/request/leave/reject/(\w+)/$", "groupmanagement/request/leave/reject/<int:group_request_id>/",
views.group_leave_reject_request, views.group_leave_reject_request,
name="leave_reject_request", name="leave_reject_request",
), ),

26
allianceauth/hrapplications/urls.py
View File

@ -1,31 +1,31 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
app_name = 'hrapplications' app_name = 'hrapplications'
urlpatterns = [ urlpatterns = [
re_path(r'^$', views.hr_application_management_view, path('', views.hr_application_management_view,
name="index"), name="index"),
re_path(r'^create/$', views.hr_application_create_view, path('create/', views.hr_application_create_view,
name="create_view"), name="create_view"),
re_path(r'^create/(\d+)', views.hr_application_create_view, path('create/<int:form_id>/', views.hr_application_create_view,
name="create_view"), name="create_view"),
re_path(r'^remove/(\w+)', views.hr_application_remove, path('remove/<int:app_id>/', views.hr_application_remove,
name="remove"), name="remove"),
re_path(r'^view/(\w+)', views.hr_application_view, path('view/<int:app_id>/', views.hr_application_view,
name="view"), name="view"),
re_path(r'^personal/view/(\w+)', views.hr_application_personal_view, path('personal/view/<int:app_id>/', views.hr_application_personal_view,
name="personal_view"), name="personal_view"),
re_path(r'^personal/removal/(\w+)', path('personal/removal/<int:app_id>/',
views.hr_application_personal_removal, views.hr_application_personal_removal,
name="personal_removal"), name="personal_removal"),
re_path(r'^approve/(\w+)', views.hr_application_approve, path('approve/<int:app_id>/', views.hr_application_approve,
name="approve"), name="approve"),
re_path(r'^reject/(\w+)', views.hr_application_reject, path('reject/<int:app_id>/', views.hr_application_reject,
name="reject"), name="reject"),
re_path(r'^search/', views.hr_application_search, path('search/', views.hr_application_search,
name="search"), name="search"),
re_path(r'^mark_in_progress/(\w+)', views.hr_application_mark_in_progress, path('mark_in_progress/<int:app_id>/', views.hr_application_mark_in_progress,
name="mark_in_progress"), name="mark_in_progress"),
] ]

16
allianceauth/notifications/urls.py
View File

@ -1,16 +1,16 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
app_name = 'notifications' app_name = 'notifications'
# Notifications # Notifications
urlpatterns = [ urlpatterns = [
re_path(r'^remove_notifications/(\w+)/$', views.remove_notification, name='remove'), path('remove_notifications/<int:notif_id>/', views.remove_notification, name='remove'),
re_path(r'^notifications/mark_all_read/$', views.mark_all_read, name='mark_all_read'), path('notifications/mark_all_read/', views.mark_all_read, name='mark_all_read'),
re_path(r'^notifications/delete_all_read/$', views.delete_all_read, name='delete_all_read'), path('notifications/delete_all_read/', views.delete_all_read, name='delete_all_read'),
re_path(r'^notifications/$', views.notification_list, name='list'), path('notifications/', views.notification_list, name='list'),
re_path(r'^notifications/(\w+)/$', views.notification_view, name='view'), path('notifications/<int:notif_id>/', views.notification_view, name='view'),
re_path( path(
r'^user_notifications_count/(?P<user_pk>\d+)/$', 'user_notifications_count/<int:user_pk>/',
views.user_notifications_count, views.user_notifications_count,
name='user_notifications_count' name='user_notifications_count'
), ),

12
allianceauth/optimer/urls.py
View File

@ -1,12 +1,12 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
app_name = 'optimer' app_name = 'optimer'
urlpatterns = [ urlpatterns = [
re_path(r'^$', views.optimer_view, name='view'), path('', views.optimer_view, name='view'),
re_path(r'^add$', views.add_optimer_view, name='add'), path('add/', views.add_optimer_view, name='add'),
re_path(r'^(\w+)/remove$', views.remove_optimer, name='remove'), path('<int:optimer_id>/remove/', views.remove_optimer, name='remove'),
re_path(r'^(\w+)/edit$', views.edit_optimer, name='edit'), path('<int:optimer_id>/edit/', views.edit_optimer, name='edit'),
] ]

3
allianceauth/permissions_tool/urls.py
View File

@ -1,11 +1,12 @@
from django.urls import re_path from django.urls import re_path
from django.urls import path
from . import views from . import views
app_name = 'permissions_tool' app_name = 'permissions_tool'
urlpatterns = [ urlpatterns = [
re_path(r'^overview/$', views.permissions_overview, name='overview'), path('overview/', views.permissions_overview, name='overview'),
re_path(r'^audit/(?P<app_label>[\w\-_]+)/(?P<model>[\w\-_]+)/(?P<codename>[\w\-_]+)/$', views.permissions_audit, re_path(r'^audit/(?P<app_label>[\w\-_]+)/(?P<model>[\w\-_]+)/(?P<codename>[\w\-_]+)/$', views.permissions_audit,
name='audit'), name='audit'),
] ]

14
allianceauth/services/modules/discord/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -7,13 +7,13 @@ app_name = 'discord'
module_urls = [ module_urls = [
# Discord Service Control # Discord Service Control
re_path(r'^activate/$', views.activate_discord, name='activate'), path('activate/', views.activate_discord, name='activate'),
re_path(r'^deactivate/$', views.deactivate_discord, name='deactivate'), path('deactivate/', views.deactivate_discord, name='deactivate'),
re_path(r'^reset/$', views.reset_discord, name='reset'), path('reset/', views.reset_discord, name='reset'),
re_path(r'^callback/$', views.discord_callback, name='callback'), path('callback/', views.discord_callback, name='callback'),
re_path(r'^add_bot/$', views.discord_add_bot, name='add_bot'), path('add_bot/', views.discord_add_bot, name='add_bot'),
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^discord/', include((module_urls, app_name), namespace=app_name)) path('discord/', include((module_urls, app_name), namespace=app_name))
] ]

4
allianceauth/services/modules/discourse/urls.py
View File

@ -1,8 +1,8 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
urlpatterns = [ urlpatterns = [
# Discourse Service Control # Discourse Service Control
re_path(r'^discourse/sso$', views.discourse_sso, name='auth_discourse_sso'), path('discourse/sso', views.discourse_sso, name='auth_discourse_sso'),
] ]

4
allianceauth/services/modules/example/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
app_name = 'example' app_name = 'example'
@ -8,5 +8,5 @@ module_urls = [
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^example/', include((module_urls, app_name), namespace=app_name)), path('example/', include((module_urls, app_name), namespace=app_name)),
] ]

12
allianceauth/services/modules/ips4/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -7,12 +7,12 @@ app_name = 'ips4'
module_urls = [ module_urls = [
# IPS4 Service Control # IPS4 Service Control
re_path(r'^activate/$', views.activate_ips4, name='activate'), path('activate/', views.activate_ips4, name='activate'),
re_path(r'^deactivate/$', views.deactivate_ips4, name='deactivate'), path('deactivate/', views.deactivate_ips4, name='deactivate'),
re_path(r'^reset_password/$', views.reset_ips4_password, name='reset_password'), path('reset_password/', views.reset_ips4_password, name='reset_password'),
re_path(r'^set_password/$', views.set_ips4_password, name='set_password'), path('set_password/', views.set_ips4_password, name='set_password'),
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^ips4/', include((module_urls, app_name), namespace=app_name)) path('ips4/', include((module_urls, app_name), namespace=app_name))
] ]

12
allianceauth/services/modules/mumble/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -7,12 +7,12 @@ app_name = 'mumble'
module_urls = [ module_urls = [
# Mumble service control # Mumble service control
re_path(r'^activate/$', views.CreateAccountMumbleView.as_view(), name='activate'), path('activate/', views.CreateAccountMumbleView.as_view(), name='activate'),
re_path(r'^deactivate/$', views.DeleteMumbleView.as_view(), name='deactivate'), path('deactivate/', views.DeleteMumbleView.as_view(), name='deactivate'),
re_path(r'^reset_password/$', views.ResetPasswordMumbleView.as_view(), name='reset_password'), path('reset_password/', views.ResetPasswordMumbleView.as_view(), name='reset_password'),
re_path(r'^set_password/$', views.SetPasswordMumbleView.as_view(), name='set_password'), path('set_password/', views.SetPasswordMumbleView.as_view(), name='set_password'),
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^mumble/', include((module_urls, app_name), namespace=app_name)) path('mumble/', include((module_urls, app_name), namespace=app_name))
] ]

14
allianceauth/services/modules/openfire/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -7,13 +7,13 @@ app_name = 'openfire'
module_urls = [ module_urls = [
# Jabber Service Control # Jabber Service Control
re_path(r'^activate/$', views.activate_jabber, name='activate'), path('activate/', views.activate_jabber, name='activate'),
re_path(r'^deactivate/$', views.deactivate_jabber, name='deactivate'), path('deactivate/', views.deactivate_jabber, name='deactivate'),
re_path(r'^reset_password/$', views.reset_jabber_password, name='reset_password'), path('reset_password/', views.reset_jabber_password, name='reset_password'),
re_path(r'^set_password/$', views.set_jabber_password, name='set_password'), path('set_password/', views.set_jabber_password, name='set_password'),
re_path(r'^broadcast/$', views.jabber_broadcast_view, name='broadcast'), path('broadcast/', views.jabber_broadcast_view, name='broadcast'),
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^openfire/', include((module_urls, app_name), namespace=app_name)), path('openfire/', include((module_urls, app_name), namespace=app_name)),
] ]

12
allianceauth/services/modules/phpbb3/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -7,12 +7,12 @@ app_name = 'phpbb3'
module_urls = [ module_urls = [
# Forum Service Control # Forum Service Control
re_path(r'^activate/$', views.activate_forum, name='activate'), path('activate/', views.activate_forum, name='activate'),
re_path(r'^deactivate/$', views.deactivate_forum, name='deactivate'), path('deactivate/', views.deactivate_forum, name='deactivate'),
re_path(r'^reset_password/$', views.reset_forum_password, name='reset_password'), path('reset_password/', views.reset_forum_password, name='reset_password'),
re_path(r'^set_password/$', views.set_forum_password, name='set_password'), path('set_password/', views.set_forum_password, name='set_password'),
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^phpbb3/', include((module_urls, app_name), namespace=app_name)) path('phpbb3/', include((module_urls, app_name), namespace=app_name))
] ]

12
allianceauth/services/modules/smf/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -7,12 +7,12 @@ app_name = 'smf'
module_urls = [ module_urls = [
# SMF Service Control # SMF Service Control
re_path(r'^activate/$', views.activate_smf, name='activate'), path('activate/', views.activate_smf, name='activate'),
re_path(r'^deactivate/$', views.deactivate_smf, name='deactivate'), path('deactivate/', views.deactivate_smf, name='deactivate'),
re_path(r'^reset_password/$', views.reset_smf_password, name='reset_password'), path('reset_password/', views.reset_smf_password, name='reset_password'),
re_path(r'^set_password/$', views.set_smf_password, name='set_password'), path('set_password/', views.set_smf_password, name='set_password'),
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^smf/', include((module_urls, app_name), namespace=app_name)), path('smf/', include((module_urls, app_name), namespace=app_name)),
] ]

16
allianceauth/services/modules/teamspeak3/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -7,19 +7,19 @@ app_name = 'teamspeak3'
module_urls = [ module_urls = [
# Teamspeak3 service control # Teamspeak3 service control
re_path(r'^activate/$', views.activate_teamspeak3, name='activate'), path('activate/', views.activate_teamspeak3, name='activate'),
re_path(r'^deactivate/$', views.deactivate_teamspeak3, name='deactivate'), path('deactivate/', views.deactivate_teamspeak3, name='deactivate'),
re_path(r'^reset_perm/$', views.reset_teamspeak3_perm, name='reset_perm'), path('reset_perm/', views.reset_teamspeak3_perm, name='reset_perm'),
re_path( path(
r'^admin_update_ts3_groups/$', 'admin_update_ts3_groups/',
views.admin_update_ts3_groups, views.admin_update_ts3_groups,
name='admin_update_ts3_groups' name='admin_update_ts3_groups'
), ),
# Teamspeak Urls # Teamspeak Urls
re_path(r'^verify/$', views.verify_teamspeak3, name='verify'), path('verify/', views.verify_teamspeak3, name='verify'),
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^teamspeak3/', include((module_urls, app_name), namespace=app_name)), path('teamspeak3/', include((module_urls, app_name), namespace=app_name)),
] ]

12
allianceauth/services/modules/xenforo/urls.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import include from django.conf.urls import include
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -7,12 +7,12 @@ app_name = 'xenforo'
module_urls = [ module_urls = [
# XenForo service control # XenForo service control
re_path(r'^activate/$', views.activate_xenforo_forum, name='activate'), path('activate/', views.activate_xenforo_forum, name='activate'),
re_path(r'^deactivate/$', views.deactivate_xenforo_forum, name='deactivate'), path('deactivate/', views.deactivate_xenforo_forum, name='deactivate'),
re_path(r'^reset_password/$', views.reset_xenforo_password, name='reset_password'), path('reset_password/', views.reset_xenforo_password, name='reset_password'),
re_path(r'^set_password/$', views.set_xenforo_password, name='set_password'), path('set_password/', views.set_xenforo_password, name='set_password'),
] ]
urlpatterns = [ urlpatterns = [
re_path(r'^xenforo/', include((module_urls, app_name), namespace=app_name)), path('xenforo/', include((module_urls, app_name), namespace=app_name)),
] ]

8
allianceauth/services/urls.py
View File

@ -1,15 +1,15 @@
from django.conf.urls import include from django.conf.urls import include
from allianceauth.hooks import get_hooks from allianceauth.hooks import get_hooks
from django.urls import re_path from django.urls import path
from . import views from . import views
urlpatterns = [ urlpatterns = [
# Services # Services
re_path(r'^services/', include(([ path('services/', include(([
re_path(r'^$', views.services_view, name='services'), path('', views.services_view, name='services'),
# Tools # Tools
re_path(r'^tool/fleet_formatter_tool/$', views.fleet_formatter_view, name='fleet_format_tool'), path('tool/fleet_formatter_tool/', views.fleet_formatter_view, name='fleet_format_tool'),
], 'services'), namespace='services')), ], 'services'), namespace='services')),
] ]

32
allianceauth/srp/urls.py
View File

@ -1,4 +1,4 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
@ -6,27 +6,27 @@ app_name = 'srp'
urlpatterns = [ urlpatterns = [
# SRP URLS # SRP URLS
re_path(r'^$', views.srp_management, name='management'), path('', views.srp_management, name='management'),
re_path(r'^all/$', views.srp_management, {'all': True}, name='all'), path('all/', views.srp_management, {'all': True}, name='all'),
re_path(r'^(\w+)/view$', views.srp_fleet_view, name='fleet'), path('<int:fleet_id>/view/', views.srp_fleet_view, name='fleet'),
re_path(r'^add/$', views.srp_fleet_add_view, name='add'), path('add/', views.srp_fleet_add_view, name='add'),
re_path(r'^(\w+)/edit$', views.srp_fleet_edit_view, name='edit'), path('<int:fleet_id>/edit/', views.srp_fleet_edit_view, name='edit'),
re_path(r'^(\w+)/request', views.srp_request_view, name='request'), path('<str:fleet_srp>/request', views.srp_request_view, name='request'),
# SRP URLS # SRP URLS
re_path(r'^(\w+)/remove$', views.srp_fleet_remove, name='remove'), path('<int:fleet_id>/remove/', views.srp_fleet_remove, name='remove'),
re_path(r'^(\w+)/disable$', views.srp_fleet_disable, name='disable'), path('<int:fleet_id>/disable/', views.srp_fleet_disable, name='disable'),
re_path(r'^(\w+)/enable$', views.srp_fleet_enable, name='enable'), path('<int:fleet_id>/enable/', views.srp_fleet_enable, name='enable'),
re_path(r'^(\w+)/complete$', views.srp_fleet_mark_completed, path('<int:fleet_id>/complete/', views.srp_fleet_mark_completed,
name='mark_completed'), name='mark_completed'),
re_path(r'^(\w+)/incomplete$', views.srp_fleet_mark_uncompleted, path('<int:fleet_id>/incomplete/', views.srp_fleet_mark_uncompleted,
name='mark_uncompleted'), name='mark_uncompleted'),
re_path(r'^request/remove/', views.srp_request_remove, path('request/remove/', views.srp_request_remove,
name="request_remove"), name="request_remove"),
re_path(r'^request/approve/', views.srp_request_approve, path('request/approve/', views.srp_request_approve,
name='request_approve'), name='request_approve'),
re_path(r'^request/reject/', views.srp_request_reject, path('request/reject/', views.srp_request_reject,
name='request_reject'), name='request_reject'),
re_path(r'^request/(\w+)/update', views.srp_request_update_amount, path('request/<int:fleet_srp_request_id>/update', views.srp_request_update_amount,
name="request_update_amount"), name="request_update_amount"),
] ]

10
allianceauth/timerboard/urls.py
View File

@ -1,12 +1,12 @@
from django.urls import re_path from django.urls import path
from . import views from . import views
app_name = 'timerboard' app_name = 'timerboard'
urlpatterns = [ urlpatterns = [
re_path(r'^$', views.TimerView.as_view(), name='view'), path('', views.TimerView.as_view(), name='view'),
re_path(r'^add/$', views.AddTimerView.as_view(), name='add'), path('add/', views.AddTimerView.as_view(), name='add'),
re_path(r'^remove/(?P<pk>\w+)$', views.RemoveTimerView.as_view(), name='delete'), path('remove/<int:pk>/', views.RemoveTimerView.as_view(), name='delete'),
re_path(r'^edit/(?P<pk>\w+)$', views.EditTimerView.as_view(), name='edit'), path('edit/<int:pk>/', views.EditTimerView.as_view(), name='edit'),
] ]

26
allianceauth/urls.py
View File

@ -1,4 +1,4 @@
from django.urls import re_path from django.urls import path
import esi.urls import esi.urls
from django.conf.urls import include from django.conf.urls import include
@ -22,35 +22,35 @@ admin.site.site_header = NAME
# Functional/Untranslated URL's # Functional/Untranslated URL's
urlpatterns = [ urlpatterns = [
# Locale # Locale
re_path(r'^i18n/', include('django.conf.urls.i18n')), path('i18n/', include('django.conf.urls.i18n')),
# Authentication # Authentication
re_path(r'', include(allianceauth.authentication.urls)), path('', include(allianceauth.authentication.urls)),
re_path(r'^account/login/$', TemplateView.as_view(template_name='public/login.html'), name='auth_login_user'), path('account/login/', TemplateView.as_view(template_name='public/login.html'), name='auth_login_user'),
re_path(r'^account/', include(hmac_urls)), path('account/', include(hmac_urls)),
# Admin urls # Admin urls
re_path(r'^admin/', admin.site.urls), path('admin/', admin.site.urls),
# SSO # SSO
re_path(r'^sso/', include((esi.urls, 'esi'), namespace='esi')), path('sso/', include((esi.urls, 'esi'), namespace='esi')),
re_path(r'^sso/login$', allianceauth.authentication.views.sso_login, name='auth_sso_login'), path('sso/login', allianceauth.authentication.views.sso_login, name='auth_sso_login'),
# Notifications # Notifications
re_path(r'', include(allianceauth.notifications.urls)), path('', include(allianceauth.notifications.urls)),
# Groups # Groups
re_path(r'', include(allianceauth.groupmanagement.urls)), path('', include(allianceauth.groupmanagement.urls)),
# Services # Services
re_path(r'', decorate_url_patterns(allianceauth.services.urls.urlpatterns, main_character_required)), path('', decorate_url_patterns(allianceauth.services.urls.urlpatterns, main_character_required)),
# Night mode # Night mode
re_path(r'^night/', views.NightModeRedirectView.as_view(), name='nightmode') path('night/', views.NightModeRedirectView.as_view(), name='nightmode')
] ]
# Append app urls # Append app urls
app_urls = get_hooks('url_hook') app_urls = get_hooks('url_hook')
for app in app_urls: for app in app_urls:
urlpatterns += [re_path(r'', decorate_url_patterns([app().include_pattern], main_character_required))] urlpatterns += [path('', decorate_url_patterns([app().include_pattern], main_character_required))]

16
tests/urls.py
View File

@ -1,17 +1,17 @@
import allianceauth.urls import allianceauth.urls
from django.urls import re_path from django.urls import path
from . import views from . import views
urlpatterns = allianceauth.urls.urlpatterns urlpatterns = allianceauth.urls.urlpatterns
urlpatterns += [ urlpatterns += [
# Navhelper test urls # Navhelper test urls
re_path(r'^main-page/$', views.page, name='p1'), path("main-page/", views.page, name="p1"),
re_path(r'^main-page/sub-section/$', views.page, name='p1-s1'), path("main-page/sub-section/", views.page, name="p1-s1"),
re_path(r'^second-page/$', views.page, name='p1'), path("second-page/", views.page, name="p1"),
] ]
handler500 = 'allianceauth.views.Generic500Redirect' handler500 = "allianceauth.views.Generic500Redirect"
handler404 = 'allianceauth.views.Generic404Redirect' handler404 = "allianceauth.views.Generic404Redirect"
handler403 = 'allianceauth.views.Generic403Redirect' handler403 = "allianceauth.views.Generic403Redirect"
handler400 = 'allianceauth.views.Generic400Redirect' handler400 = "allianceauth.views.Generic400Redirect"