fix urls

diff --git a/poetry.lock b/poetry.lock
index e3b3a36646d1a6f2fbb66ecf492c18673702bfb0..68beae20a852f13e5a2270b08b83545344e38238 100644 (file)
--- a/poetry.lock
+++ b/poetry.lock
@@ -725,12 +725,13 @@ python-nvd3 = "0.14.2"
 
 [[package]]
 name = "django-postman"
-version = "4.2"
+version = "4.5"
 description = "User-to-User messaging system for Django, with gateway to AnonymousUser, moderation and thread management, user & exchange filters, inbox/sent/archives/trash folders, support for apps: auto-complete, notification, mailer."
 optional = false
 python-versions = "*"
 files = [
-    {file = "django-postman-4.2.tar.gz", hash = "sha256:bc351c261325eba78ac70f2a8236482d74fca5e2ca5172311cf9a67f32f6fc32"},
+    {file = "django_postman-4.5-py3-none-any.whl", hash = "sha256:3d20ea230a39193e5d192590f8cbad0b0d9fedb5a493799388b767c8ee47282b"},
+    {file = "django_postman-4.5.tar.gz", hash = "sha256:5b6f3ae9c5ebef5744ad5af88ee8063bf0171f09bcec020ed2457a93386b1b13"},
 ]
 
 [package.dependencies]
@@ -2712,4 +2713,4 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "0f495bc1375059288cee4916b52f065b9c5bbc46ea4b8f0e6d87c29db567ff10"
+content-hash = "0bb9bb0f7644d8a2deadd26a1f7498537704175d49c8417b799f04a197bb16dc"

diff --git a/pyproject.toml b/pyproject.toml
index 1d5f0f62b4f1b2ef9c231e35cc3b8676aa9f05c4..8cbe4317457623ff722e52fafa626706e16590e2 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ dj-pagination = "2.5.0"
 django-jazzmin = "2.4.7"
 django-json-rpc = {git = "https://github.com/Parisson/django-json-rpc.git"}
 django-nvd3 = "0.9.7"
-django-postman = "4.2"
+django-postman = "4.5"
 django-tinymce = "3.3.0"
 django-unique-session = "1.0.0"
 django-user-agents = "0.4.0"

diff --git a/teleforma/exam/urls.py b/teleforma/exam/urls.py
index 9280a12cd5f93988ae1173753dff69109324d64c..5d81c115082ac5fd771284ddde701190b61de348 100644 (file)
--- a/teleforma/exam/urls.py
+++ b/teleforma/exam/urls.py
@@ -37,23 +37,23 @@ from django.urls import path
 
 
 urlpatterns = [
-    path('scripts/periods/<int:period_id>.*)/<str:pk>.*)/detail/', ScriptView.as_view(), name="teleforma-exam-script-detail"),
-    path('scripts/periods/<int:period_id>.*)/<str:pk>.*)/download/', ScriptDownloadView.as_view(), name="teleforma-exam-script-download"),
-    path('scripts/periods/<int:period_id>.*)/list/', ScriptsView.as_view(), name="teleforma-exam-script-list"),
-    path('scripts/periods/<int:period_id>.*)/create/', ScriptCreateView.as_view(), name="teleforma-exam-script-create"),
-    path('scripts/periods/<int:period_id>.*)/pending/', ScriptsPendingView.as_view(), name="teleforma-exam-scripts-pending"),
-    path('scripts/periods/<int:period_id>.*)/treated/', ScriptsTreatedView.as_view(), name="teleforma-exam-scripts-treated"),
-    path('scripts/periods/<int:period_id>.*)/rejected/', ScriptsRejectedView.as_view(), name="teleforma-exam-scripts-rejected"),
-
-    path('scores/periods/<int:period_id>.*)/all/', ScriptsScoreAllView.as_view(), name="teleforma-exam-scripts-scores-all"),
-    path('scores/periods/<int:period_id>.*)/courses/<course_id>.*)/', ScriptsScoreCourseView.as_view(), name="teleforma-exam-scripts-scores-course"),
-    path('scores/periods/<int:period_id>.*)/create/', ScoreCreateView.as_view(), name="teleforma-exam-scores-create"),
-    path('scores/periods/<int:period_id>.*)/mass_create/', MassScoreCreateView.as_view(), name="teleforma-exam-scores-mass-create"),
+    path('scripts/periods/<int:period_id>/<str:pk>/detail/', ScriptView.as_view(), name="teleforma-exam-script-detail"),
+    path('scripts/periods/<int:period_id>/<str:pk>/download/', ScriptDownloadView.as_view(), name="teleforma-exam-script-download"),
+    path('scripts/periods/<int:period_id>/list/', ScriptsView.as_view(), name="teleforma-exam-script-list"),
+    path('scripts/periods/<int:period_id>/create/', ScriptCreateView.as_view(), name="teleforma-exam-script-create"),
+    path('scripts/periods/<int:period_id>/pending/', ScriptsPendingView.as_view(), name="teleforma-exam-scripts-pending"),
+    path('scripts/periods/<int:period_id>/treated/', ScriptsTreatedView.as_view(), name="teleforma-exam-scripts-treated"),
+    path('scripts/periods/<int:period_id>/rejected/', ScriptsRejectedView.as_view(), name="teleforma-exam-scripts-rejected"),
+
+    path('scores/periods/<int:period_id>/all/', ScriptsScoreAllView.as_view(), name="teleforma-exam-scripts-scores-all"),
+    path('scores/periods/<int:period_id>/courses/<course_id>/', ScriptsScoreCourseView.as_view(), name="teleforma-exam-scripts-scores-course"),
+    path('scores/periods/<int:period_id>/create/', ScoreCreateView.as_view(), name="teleforma-exam-scores-create"),
+    path('scores/periods/<int:period_id>/mass_create/', MassScoreCreateView.as_view(), name="teleforma-exam-scores-mass-create"),
 
     path('scripts/get-correctors/', get_correctors, name="teleforma-exam-get-correctors"),
     path('scripts/get-mass-students/', get_mass_students, name="teleforma-exam-get-mass-students"),
 
-    path('quotas/periods/<int:period_id>.*)/list/',
+    path('quotas/periods/<int:period_id>/list/',
         QuotasView.as_view(),
         name="teleforma-exam-quotas"),
 

diff --git a/teleforma/urls.py b/teleforma/urls.py
index a77fed497cb9156515b9eef44348498e021095eb..ea46f7c3f31e2f2d3d01e7f2c915fd1ef0038063 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -92,27 +92,27 @@ urlpatterns = [
         name="teleforma-register"),
     path('accounts/register/uyl/', UserAddUseYourLawOriginView.as_view(),
         name="teleforma-register-uyl"),
-    path('accounts/register/<username>.*)/complete/',
+    path('accounts/register/<username>/complete/',
         UserCompleteView.as_view(), name="teleforma-register-complete"),
-    path('accounts/register/<username>.*)/download/',
+    path('accounts/register/<username>/download/',
         RegistrationPDFViewDownload.as_view(), name="teleforma-registration-download"),
-    path('accounts/register/<username>.*)/view/',
+    path('accounts/register/<username>/view/',
         RegistrationPDFView.as_view(), name="teleforma-registration-view"),
 
     path('correctors/register/', CorrectorAddView.as_view(),
         name="teleforma-corrector-register"),
-    path('correctors/register/<username>.*)/complete/',
+    path('correctors/register/<username>/complete/',
         CorrectorCompleteView.as_view(), name="teleforma-corrector-register-complete"),
-    path('correctors/register/<username>.*)/download/',
+    path('correctors/register/<username>/download/',
         CorrectorRegistrationPDFViewDownload.as_view(), name="teleforma-corrector-registration-download"),
-    path('correctors/register/<username>.*)/view/',
+    path('correctors/register/<username>/view/',
         CorrectorRegistrationPDFView.as_view(), name="teleforma-corrector-registration-view"),
 
-    path('users/<username>[A-Za-z0-9+@._-]+)/profile/', profile_view.profile_detail,
+    path('users/<username>/profile/', profile_view.profile_detail,
         name="teleforma-profile-detail"),
-    path('accounts/<username>[A-Za-z0-9+@._-]+)/profile/',
+    path('accounts/<username>/profile/',
         profile_view.profile_detail, name="teleforma-profile-detail"),
-    path('accounts/<username>[A-Za-z0-9+@._-]+)/profile/edit/',
+    path('accounts/<username>/profile/edit/',
         profile_view.profile_edit, name="teleforma-profile-edit"),
 
     # Registration
@@ -138,7 +138,7 @@ urlpatterns = [
         name="teleforma-home"),
 
     # Flat pages
-    path('pages/<path>.*)', home_view.render_flatpage,
+    path('pages/<path>', home_view.render_flatpage,
         name="teleforma-flatpage"),
     # Unauthorized
     path('unauthorized/', TemplateView.as_view(template_name="teleforma/unauthorized.html"),
@@ -148,40 +148,40 @@ urlpatterns = [
     # Desk
     path('desk/', HomeRedirectView.as_view(),
         name="teleforma-desk"),
-    path('desk/periods/<period_id>.*)/courses/',
+    path('desk/periods/<period_id>/courses/',
         CourseListView.as_view(), name="teleforma-desk-period-list"),
-    path('desk/periods/<period_id>.*)/courses_pending/',
+    path('desk/periods/<period_id>/courses_pending/',
         CoursePendingListView.as_view(), name="teleforma-desk-period-pending"),
-    path('desk/periods/<period_id>.*)/courses/<pk>.*)/detail/',
+    path('desk/periods/<period_id>/courses/<pk>/detail/',
         CourseView.as_view(),
         name="teleforma-desk-period-course"),
-    path('desk/periods/<period_id>.*)/courses/<pk>.*)/retractation/',
+    path('desk/periods/<period_id>/courses/<pk>/retractation/',
         RetractationView.as_view(),
         name="teleforma-desk-period-course-retractation"),
 
     # Media
-    path('desk/periods/<period_id>.*)/medias/transcode/<pk>.*)/detail/',
+    path('desk/periods/<period_id>/medias/transcode/<pk>/detail/',
         MediaTranscodedView.as_view(), name="teleforma-media-transcoded"),
-    path('desk/periods/<period_id>.*)/medias/transcode/<pk>.*)/download/',
+    path('desk/periods/<period_id>/medias/transcode/<pk>/download/',
         media_transcoded.download, name="teleforma-media-transcoded-download"),
-    path('desk/periods/<period_id>.*)/medias/transcode/<pk>.*)/stream/',
+    path('desk/periods/<period_id>/medias/transcode/<pk>/stream/',
         media_transcoded.stream, name="teleforma-media-transcoded-stream"),
-    path('desk/periods/<period_id>.*)/medias/<pk>.*)/detail/',
+    path('desk/periods/<period_id>/medias/<pk>/detail/',
         MediaView.as_view(),
         name="teleforma-media-detail"),
-    path('desk/periods/<period_id>.*)/medias/<pk>.*)/embed/',
+    path('desk/periods/<period_id>/medias/<pk>/embed/',
         MediaViewEmbed.as_view(), name="teleforma-media-embed"),
-    path('desk/periods/<period_id>.*)/medias/<pk>.*)/download/',
+    path('desk/periods/<period_id>/medias/<pk>/download/',
         media.download, name="teleforma-media-download"),
-    path('desk/periods/<period_id>.*)/medias/<pk>.*)/stream/',
+    path('desk/periods/<period_id>/medias/<pk>/stream/',
         media.stream, name="teleforma-media-stream"),
 
     # Documents
-    path('desk/documents/<pk>.*)/detail/', DocumentView.as_view(),
+    path('desk/documents/<pk>/detail/', DocumentView.as_view(),
         name="teleforma-document-detail"),
-    path('desk/documents/<pk>.*)/download/', document.download,
+    path('desk/documents/<pk>/download/', document.download,
         name="teleforma-document-download"),
-    path('desk/documents/<pk>.*)/view/', document.view,
+    path('desk/documents/<pk>/view/', document.view,
         name="teleforma-document-view"),
 
     # Annals
@@ -194,18 +194,18 @@ urlpatterns = [
         AnnalsCourseView.as_view(), name="teleforma-annals-course"),
 
     # Conferences
-    path('desk/periods/<period_id>.*)/conferences/<pk>.*)/video/',
+    path('desk/periods/<period_id>/conferences/<pk>/video/',
         ConferenceView.as_view(),
         name="teleforma-conference-detail"),
-    path('desk/periods/<period_id>.*)/conferences/<pk>.*)/audio/',
+    path('desk/periods/<period_id>/conferences/<pk>/audio/',
         ConferenceView.as_view(
             template_name="teleforma/course_conference_audio.html"),
         name="teleforma-conference-audio"),
-    path('desk/periods/<period_id>.*)/conferences/list/', ConferenceListView.as_view(),
+    path('desk/periods/<period_id>/conferences/list/', ConferenceListView.as_view(),
         name="teleforma-conferences"),
 
     # APPOINTMENTS
-    path('desk/periods/<period_id>.*)/appointments/<course_id>.*)/', Appointments.as_view(),
+    path('desk/periods/<period_id>/appointments/<course_id>/', Appointments.as_view(),
         name="teleforma-appointments"),
     path('desk/periods/appointments/cancel', cancel_appointment,
         name="teleforma-appointment-cancel"),
@@ -217,29 +217,29 @@ urlpatterns = [
 
 
     # Users
-    path('users/training/<training_id>.*)/iej/<iej_id>.*)/course/<course_id>.*)/list/',
+    path('users/training/<training_id>/iej/<iej_id>/course/<course_id>/list/',
         UsersView.as_view(), name="teleforma-users"),
 
-    path('users/training/<training_id>.*)/iej/<iej_id>.*)/course/<course_id>.*)/export/',
+    path('users/training/<training_id>/iej/<iej_id>/course/<course_id>/export/',
         UsersExportView.as_view(), name="teleforma-users-export"),
 
-    path('users/<id>.*)/login/',
+    path('users/<id>/login/',
         UserLoginView.as_view(), name="teleforma-user-login"),
 
     # Ajax update training
-    path('update-training/<id>.*)/',
+    path('update-training/<id>/',
         update_training, name="update-training"),
 
     # News Item
-    path('desk/periods/<period_id>.*)/medias/<pk>.*)/detail/',
+    path('desk/periods/<period_id>/medias/<pk>/detail/',
         MediaView.as_view(), name="teleforma-media-detail"),
     path('newsitems/create', NewsItemCreate.as_view(),
         name='newsitem-create'),
-    path('newsitems/update/<pk>.*)',
+    path('newsitems/update/<pk>',
         NewsItemUpdate.as_view(), name='newsitem-update'),
-    path('newsitems/delete/<pk>.*)',
+    path('newsitems/delete/<pk>',
         NewsItemDelete.as_view(), name='newsitem-delete'),
-    path('newsitems/<period_id>.*)/list',
+    path('newsitems/<period_id>/list',
         NewsItemList.as_view(), name='newsitem-list'),
 
     # JSON RPC
@@ -257,22 +257,22 @@ urlpatterns = [
     path('', include('teleforma.webclass.urls')),
 
     # Payment
-    path('payment/<pk>.*)/start/', PaymentStartView.as_view(),
+    path('payment/<pk>/start/', PaymentStartView.as_view(),
         name="teleforma-payment-start"),
 
-    path('payment/bank_auto/<merchant_id>.*)',
+    path('payment/bank_auto/<merchant_id>',
         bank_auto, name='teleforma-bank-auto'),
-    path('payment/bank_success/<merchant_id>.*)',
+    path('payment/bank_success/<merchant_id>',
         bank_success, name='teleforma-bank-success'),
-    path('payment/bank_cancel/<merchant_id>.*)',
+    path('payment/bank_cancel/<merchant_id>',
         bank_cancel, name='teleforma-bank-cancel'),
 
     path('echec-de-paiement',
         bank_fail, name='teleforma-bank-fail'),
 
-    path('accounts/<username>[A-Za-z0-9+@._-]+)/receipt/download/',
+    path('accounts/<username>/receipt/download/',
         ReceiptPDFViewDownload.as_view(), name="teleforma-receipt-download"),
-    path('accounts/<username>[A-Za-z0-9+@._-]+)/receipt/view/',
+    path('accounts/<username>/receipt/view/',
         ReceiptPDFView.as_view(), name="teleforma-receipt-view"),
 
     # chat

diff --git a/teleforma/webclass/urls.py b/teleforma/webclass/urls.py
index 1f1428769b00090f9db772682c6360ff72c74945..b47d22776384db95b4e53ff3354ee52f12daa690 100644 (file)
--- a/teleforma/webclass/urls.py
+++ b/teleforma/webclass/urls.py
@@ -40,18 +40,18 @@ from ..webclass.views import (WebclassAppointment,
                               join_webclass, unregister)
 
 urlpatterns = [
-    path('desk/webclass_appointments/<pk>.*)', WebclassAppointment.as_view(),
+    path('desk/webclass_appointments/<pk>', WebclassAppointment.as_view(),
         name="teleforma-webclass-appointments"),
     path('desk/webclass_calendar/', WebclassProfessorAppointments.as_view(),
         name="teleforma-webclass-professor"),
     path('desk/webclass_record', WebclassRecordView.as_view(),
         name="teleforma-webclass-record"),
-    path('webclass/periods/<period_id>.*)/webclass_records_form/',
+    path('webclass/periods/<period_id>/webclass_records_form/',
         WebclassRecordsFormView.as_view(), name="teleforma-webclass-records-form"),
-    path('desk/webclass/<pk>.*)/unregister/',
+    path('desk/webclass/<pk>/unregister/',
         unregister,
         name="teleforma-webclass-unregister"),
-    path('desk/webclass/<pk>.*)/join/',
+    path('desk/webclass/<pk>/join/',
         join_webclass,
         name="teleforma-webclass-join")