From 85903f18f2ad260c978dc791f09e446af3692af5 Mon Sep 17 00:00:00 2001 From: Jeff McMillen Date: Wed, 27 Nov 2024 09:18:00 -0600 Subject: [PATCH] Manual merge for apcd - folder rename (#376) Co-authored-by: Chandra Y --- apcd_cms/src/apps/admin_exception/urls.py | 10 +--------- apcd_cms/src/apps/admin_extension/urls.py | 11 ++++------- apcd_cms/src/apps/admin_regis_table/urls.py | 9 ++------- apcd_cms/src/apps/registrations/urls.py | 4 +--- apcd_cms/src/apps/submitter_renewals_listing/urls.py | 6 +----- apcd_cms/src/apps/view_users/urls.py | 1 - 6 files changed, 9 insertions(+), 32 deletions(-) diff --git a/apcd_cms/src/apps/admin_exception/urls.py b/apcd_cms/src/apps/admin_exception/urls.py index 3440041c..3b0b651d 100644 --- a/apcd_cms/src/apps/admin_exception/urls.py +++ b/apcd_cms/src/apps/admin_exception/urls.py @@ -5,14 +5,6 @@ app_name = 'admin_exception' urlpatterns = [ path('list-exceptions/', TemplateView.as_view(template_name='list_admin_exception.html'), name="list_exceptions"), - path('list-exceptions/', AdminExceptionsTable.as_view(), name='status'), - path('list-exceptions/', AdminExceptionsTable.as_view(), name='org'), - path('list-exceptions/', AdminExceptionsTable.as_view(), name='status_org'), - path(r'list-exceptions/api/', AdminExceptionsTable.as_view(), name='admin_exceptions_table_api'), - path(r'list-exceptions/api/?status=(?P)/', AdminExceptionsTable.as_view(), - name='admin_exceptions_table_api'), - path(r'list-exceptions/api/?org=(?P)/', AdminExceptionsTable.as_view(), name='admin_exceptions_table_api'), - path(r'list-exceptions/api/?status=(?P)&org=(?P)/', AdminExceptionsTable.as_view(), - name='admin_exceptions_table_api'), + path('list-exceptions/api/', AdminExceptionsTable.as_view(), name='admin_exceptions_table_api'), path('exceptions//', UpdateExceptionView.as_view(), name='update_exceptions'), ] diff --git a/apcd_cms/src/apps/admin_extension/urls.py b/apcd_cms/src/apps/admin_extension/urls.py index 9612b364..6f1d4e55 100644 --- a/apcd_cms/src/apps/admin_extension/urls.py +++ b/apcd_cms/src/apps/admin_extension/urls.py @@ -5,10 +5,7 @@ app_name = 'admin_extension' urlpatterns = [ - path('list-extensions/', TemplateView.as_view(template_name='list_admin_extension.html'), name="list_extensions"), - path(r'list-extensions/api/', AdminExtensionsTable.as_view(), name='admin_extensions_table_api'), - path(r'list-extensions/api/?status=(?P)/', AdminExtensionsTable.as_view(), name='admin_extensions_table_api'), - path(r'list-extensions/api/?org=(?P)/', AdminExtensionsTable.as_view(), name='admin_extensions_table_api'), - path(r'list-extensions/api/?status=(?P)&org=(?P)/', AdminExtensionsTable.as_view(), name='admin_extensions_table_api'), - path(r'update-extension//', UpdateExtensionsView.as_view(), name='update_extension'), -] \ No newline at end of file + path('list-extensions/', TemplateView.as_view(template_name='list_admin_extension.html'), name="list_extensions"), + path('list-extensions/api/', AdminExtensionsTable.as_view(), name='admin_extensions_table_api'), + path('update-extension//', UpdateExtensionsView.as_view(), name='update_extension'), +] diff --git a/apcd_cms/src/apps/admin_regis_table/urls.py b/apcd_cms/src/apps/admin_regis_table/urls.py index 3e282491..90e93da8 100644 --- a/apcd_cms/src/apps/admin_regis_table/urls.py +++ b/apcd_cms/src/apps/admin_regis_table/urls.py @@ -5,11 +5,6 @@ app_name = 'admin_regis_table' urlpatterns = [ path('list-registration-requests/', TemplateView.as_view(template_name='list_registrations.html'), name='admin_regis_table'), - path(r'list-registration-requests/api/', RegistrationsTable.as_view(), name='admin_regis_table_api'), - path(r'list-registration-requests/api/?status=(?P)/', RegistrationsTable.as_view(), name='admin_regis_table_api'), - path(r'list-registration-requests/api/?org=(?P)/', RegistrationsTable.as_view(), name='admin_regis_table_api'), - path(r'list-registration-requests/api/?status=(?P)&org=(?P)/', RegistrationsTable.as_view(), name='admin_regis_table_api'), - path(r'list-registration-requests/api/?reg_id=(?P)/', RegistrationsTable.as_view(), name='admin_regis_table_api'), - path(r'request-to-submit/api//', RegistrationsTable.as_view(), name='admin_regis_update_api'), - + path('list-registration-requests/api/', RegistrationsTable.as_view(), name='admin_regis_table_api'), + path('request-to-submit/api//', RegistrationsTable.as_view(), name='admin_regis_update_api'), ] diff --git a/apcd_cms/src/apps/registrations/urls.py b/apcd_cms/src/apps/registrations/urls.py index bdaf3bac..8fdf6cf7 100644 --- a/apcd_cms/src/apps/registrations/urls.py +++ b/apcd_cms/src/apps/registrations/urls.py @@ -5,7 +5,5 @@ app_name = 'registrations' urlpatterns = [ path('request-to-submit/', TemplateView.as_view(template_name='registration_form.html'), name='register_form'), - path(r'request-to-submit/api/', RegistrationFormView.as_view(), name='register_form_api'), - path(r'request-to-submit/api/?reg_id=(?P)/', RegistrationFormView.as_view(), name='register_form_api'), - + path('request-to-submit/api/', RegistrationFormView.as_view(), name='register_form_api'), ] diff --git a/apcd_cms/src/apps/submitter_renewals_listing/urls.py b/apcd_cms/src/apps/submitter_renewals_listing/urls.py index eb45a224..c03c1f34 100644 --- a/apcd_cms/src/apps/submitter_renewals_listing/urls.py +++ b/apcd_cms/src/apps/submitter_renewals_listing/urls.py @@ -5,9 +5,5 @@ app_name = 'register' urlpatterns = [ path('list-registration-requests/', TemplateView.as_view(template_name='list_submitter_registrations.html'), name='submitter_regis_table'), - path(r'list-registration-requests/api/', SubmittersTable.as_view(), name='submitter_regis_table_api'), - path(r'list-registration-requests/api/?status=(?P)/', SubmittersTable.as_view(), name='submitter_regis_table_api'), - path(r'list-registration-requests/api/?org=(?P)/', SubmittersTable.as_view(), name='submitter_regis_table_api'), - path(r'list-registration-requests/api/?status=(?P)&org=(?P)/', SubmittersTable.as_view(), name='submitter_regis_table_api'), - path(r'list-registration-requests/api/?reg_id=(?P)/', SubmittersTable.as_view(), name='submitter_regis_table_api'), + path('list-registration-requests/api/', SubmittersTable.as_view(), name='submitter_regis_table_api'), ] diff --git a/apcd_cms/src/apps/view_users/urls.py b/apcd_cms/src/apps/view_users/urls.py index 9ff10a76..4f45d55d 100644 --- a/apcd_cms/src/apps/view_users/urls.py +++ b/apcd_cms/src/apps/view_users/urls.py @@ -8,6 +8,5 @@ path('view-users/api/', ViewUsersTable.as_view(), name='view_users_api'), path('view-users/api/options', ViewUsersTable.as_view(), name='view_users_api_options'), path('view-users/api/modal//', ViewUsersTable.as_view(), name='view_users_modal'), - path('view-users/api/modal//', ViewUsersTable.as_view(), name='view_users_modal'), path('users//', UpdateUserView.as_view(), name='update_user'), ]