From 4af0b2fa7b71b7805d31dcf84245a2a845984287 Mon Sep 17 00:00:00 2001 From: Kipchirchir Sigei Date: Thu, 14 Mar 2024 09:16:44 +0300 Subject: [PATCH] Update username regex in routes Signed-off-by: Kipchirchir Sigei --- onadata/apps/main/urls.py | 84 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/onadata/apps/main/urls.py b/onadata/apps/main/urls.py index 57ecdbfa9e..ff9c4dfac9 100644 --- a/onadata/apps/main/urls.py +++ b/onadata/apps/main/urls.py @@ -197,7 +197,7 @@ ), # briefcase api urls re_path( - r"^(?P\w+)/view/submissionList$", + r"^(?P[^/]+)/view/submissionList$", BriefcaseViewset.as_view({"get": "list", "head": "list"}), name="view-submission-list", ), @@ -212,7 +212,7 @@ name="view-submission-list", ), re_path( - r"^(?P\w+)/view/downloadSubmission$", + r"^(?P[^/]+)/view/downloadSubmission$", BriefcaseViewset.as_view({"get": "retrieve", "head": "retrieve"}), name="view-download-submission", ), @@ -227,117 +227,117 @@ name="view-download-submission", ), re_path( - r"^(?P\w+)/formUpload$", + r"^(?P[^/]+)/formUpload$", BriefcaseViewset.as_view({"post": "create", "head": "create"}), name="form-upload", ), re_path( - r"^(?P\w+)/upload$", + r"^(?P[^/]+)/upload$", BriefcaseViewset.as_view({"post": "create", "head": "create"}), name="upload", ), # exporting stuff re_path( - r"^(?P\w+)/forms/(?P[^/]+)/data\.csv$", + r"^(?P[^/]+)/forms/(?P[^/]+)/data\.csv$", viewer_views.data_export, name="csv_export", kwargs={"export_type": "csv"}, ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/data\.xls", + r"^(?P[^/]+)/forms/(?P[^/]+)/data\.xls", viewer_views.data_export, name="xlsx_export", kwargs={"export_type": "xlsx"}, ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/data\.csv.zip", + r"^(?P[^/]+)/forms/(?P[^/]+)/data\.csv.zip", viewer_views.data_export, name="csv_zip_export", kwargs={"export_type": "csv_zip"}, ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/data\.sav.zip", + r"^(?P[^/]+)/forms/(?P[^/]+)/data\.sav.zip", viewer_views.data_export, name="sav_zip_export", kwargs={"export_type": "sav_zip"}, ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/data\.kml$", + r"^(?P[^/]+)/forms/(?P[^/]+)/data\.kml$", viewer_views.kml_export, name="kml-export", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/data\.zip", + r"^(?P[^/]+)/forms/(?P[^/]+)/data\.zip", viewer_views.zip_export, ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/gdocs$", + r"^(?P[^/]+)/forms/(?P[^/]+)/gdocs$", viewer_views.google_xlsx_export, ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/map_embed", + r"^(?P[^/]+)/forms/(?P[^/]+)/map_embed", viewer_views.map_embed_view, ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/map", + r"^(?P[^/]+)/forms/(?P[^/]+)/map", viewer_views.map_view, name="map-view", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/instance", + r"^(?P[^/]+)/forms/(?P[^/]+)/instance", viewer_views.instance, name="submission-instance", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/enter-data", + r"^(?P[^/]+)/forms/(?P[^/]+)/enter-data", logger_views.enter_data, name="enter_data", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/add-submission-with", # noqa + r"^(?P[^/]+)/forms/(?P[^/]+)/add-submission-with", # noqa viewer_views.add_submission_with, name="add_submission_with", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/thank_you_submission", # noqa + r"^(?P[^/]+)/forms/(?P[^/]+)/thank_you_submission", # noqa viewer_views.thank_you_submission, name="thank_you_submission", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/edit-data/(?P\d+)$", # noqa + r"^(?P[^/]+)/forms/(?P[^/]+)/edit-data/(?P\d+)$", # noqa logger_views.edit_data, name="edit_data", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/view-data", + r"^(?P[^/]+)/forms/(?P[^/]+)/view-data", viewer_views.data_view, name="data-view", ), re_path( - r"^(?P\w+)/exports/(?P[^/]+)/(?P\w+)/new$", # noqa + r"^(?P[^/]+)/exports/(?P[^/]+)/(?P\w+)/new$", # noqa viewer_views.create_export, name="new-export", ), re_path( - r"^(?P\w+)/exports/(?P[^/]+)/(?P\w+)" # noqa + r"^(?P[^/]+)/exports/(?P[^/]+)/(?P\w+)" # noqa "/delete$", viewer_views.delete_export, name="delete-export", ), re_path( - r"^(?P\w+)/exports/(?P[^/]+)/(?P\w+)" # noqa + r"^(?P[^/]+)/exports/(?P[^/]+)/(?P\w+)" # noqa "/progress$", viewer_views.export_progress, name="export-progress", ), re_path( - r"^(?P\w+)/exports/(?P[^/]+)/(?P\w+)" # noqa + r"^(?P[^/]+)/exports/(?P[^/]+)/(?P\w+)" # noqa "/$", viewer_views.export_list, name="export-list", ), re_path( - r"^(?P\w+)/exports/(?P[^/]+)/(?P\w+)" # noqa + r"^(?P[^/]+)/exports/(?P[^/]+)/(?P\w+)" # noqa "/(?P[^/]+)$", viewer_views.export_download, name="export-download", @@ -366,7 +366,7 @@ name="form-list", ), re_path( - r"^(?P\w+)/formList$", + r"^(?P[^/]+)/formList$", XFormListViewSet.as_view({"get": "list", "head": "list"}), name="form-list", ), @@ -391,22 +391,22 @@ name="form-list", ), re_path( - r"^(?P\w+)/(?P\d+)/formList$", + r"^(?P[^/]+)/(?P\d+)/formList$", XFormListViewSet.as_view({"get": "list", "head": "list"}), name="form-list", ), re_path( - r"^preview/(?P\w+)/(?P\d+)/formList$", + r"^preview/(?P[^/]+)/(?P\d+)/formList$", PreviewXFormListViewSet.as_view({"get": "list", "head": "list"}), name="form-list", ), re_path( - r"^preview/(?P\w+)/formList$", + r"^preview/(?P[^/]+)/formList$", PreviewXFormListViewSet.as_view({"get": "list", "head": "list"}), name="form-list", ), re_path( - r"^(?P\w+)/xformsManifest/(?P[\d+^/]+)$", + r"^(?P[^/]+)/xformsManifest/(?P[\d+^/]+)$", XFormListViewSet.as_view({"get": "manifest", "head": "manifest"}), name="manifest-url", ), @@ -416,13 +416,13 @@ name="manifest-url", ), re_path( - r"^(?P\w+)/xformsMedia/(?P[\d+^/]+)/(?P[\d+^/.]+)$", # noqa + r"^(?P[^/]+)/xformsMedia/(?P[\d+^/]+)/(?P[\d+^/.]+)$", # noqa XFormListViewSet.as_view({"get": "media", "head": "media"}), name="xform-media", ), re_path( # pylint: disable=line-too-long - r"^(?P\w+)/xformsMedia/(?P[\d+^/]+)/(?P[\d+^/.]+)\.(?P([a-z]|[0-9])*)$", # noqa + r"^(?P[^/]+)/xformsMedia/(?P[\d+^/]+)/(?P[\d+^/.]+)\.(?P([a-z]|[0-9])*)$", # noqa XFormListViewSet.as_view({"get": "media", "head": "media"}), name="xform-media", ), @@ -438,7 +438,7 @@ name="xform-media", ), re_path( - r"^(?P\w+)/submission$", + r"^(?P[^/]+)/submission$", XFormSubmissionViewSet.as_view({"post": "create", "head": "create"}), name="submissions", ), @@ -458,41 +458,41 @@ name="submissions", ), re_path( - r"^(?P\w+)/(?P\d+)/submission$", + r"^(?P[^/]+)/(?P\d+)/submission$", XFormSubmissionViewSet.as_view({"post": "create", "head": "create"}), name="submissions", ), - re_path(r"^(?P\w+)/bulk-submission$", logger_views.bulksubmission), + re_path(r"^(?P[^/]+)/bulk-submission$", logger_views.bulksubmission), re_path( - r"^(?P\w+)/bulk-submission-form$", logger_views.bulksubmission_form + r"^(?P[^/]+)/bulk-submission-form$", logger_views.bulksubmission_form ), re_path( - r"^(?P\w+)/forms/(?P[\d+^/]+)/form\.xml$", + r"^(?P[^/]+)/forms/(?P[\d+^/]+)/form\.xml$", XFormListViewSet.as_view({"get": "retrieve", "head": "retrieve"}), name="download_xform", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/form\.xml$", + r"^(?P[^/]+)/forms/(?P[^/]+)/form\.xml$", logger_views.download_xform, name="download_xform", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/form\.xls$", + r"^(?P[^/]+)/forms/(?P[^/]+)/form\.xls$", logger_views.download_xlsform, name="download_xlsform", ), re_path( - r"^(?P\w+)/forms/(?P[^/]+)/form\.json", + r"^(?P[^/]+)/forms/(?P[^/]+)/form\.json", logger_views.download_jsonform, name="download_jsonform", ), re_path( - r"^(?P\w+)/delete/(?P[^/]+)/$", + r"^(?P[^/]+)/delete/(?P[^/]+)/$", logger_views.delete_xform, name="delete-xform", ), re_path( - r"^(?P\w+)/(?P[^/]+)/toggle_downloadable/$", + r"^(?P[^/]+)/(?P[^/]+)/toggle_downloadable/$", logger_views.toggle_downloadable, name="toggle-downloadable", ), @@ -530,7 +530,7 @@ ), # Stats tables re_path( - r"^(?P\w+)/forms/(?P[^/]+)/tables", + r"^(?P[^/]+)/forms/(?P[^/]+)/tables", viewer_views.stats_tables, name="stats-tables", ),