chore: merge feat/sreq to main (#9697)

* refactor: move session request tool to ietf.meeting and restyle (#9617)

* refactor: move session request tool to ietf.meeting and restyle to match standard Datatracker

* fix: add redirect for old session request url

* fix: move stripe javascript to js file

* fix: update copyright lines for modified files

* fix: rename javascripts and expand redirects

* fix: don't show inactive constraints label when there are none (#9680)

* chore: remove unused utility

* fix: add test for secr main menu page (#9693)

* fix: don't show inactive constraints label when there are none

* fix: add test for secr main menu page

---------

Co-authored-by: Jennifer Richards <[email protected]>
Co-authored-by: Robert Sparks <[email protected]>

Author: 3 people

ietf/meeting/forms.py

@@ -1,3 +1,5 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
 from django import template
 from ietf.person.models import Person
 

ietf/secr/sreq/templatetags/ams_filters.py renamed to ietf/meeting/templatetags/ams_filters.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2024, All Rights Reserved
+# Copyright The IETF Trust 2009-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 import datetime
 import io
@@ -7554,7 +7554,7 @@ def test_meeting_requests(self):
         )
         def _sreq_edit_link(sess):
             return urlreverse(
-                'ietf.secr.sreq.views.edit',
+                'ietf.meeting.views_session_request.edit_request',
                 kwargs={
                     'num': meeting.number,
                     'acronym': sess.group.acronym,

ietf/secr/sreq/tests.py renamed to ietf/meeting/tests_session_requests.py

@@ -1,10 +1,10 @@
-# Copyright The IETF Trust 2007-2024, All Rights Reserved
+# Copyright The IETF Trust 2007-2025, All Rights Reserved
 
 from django.conf import settings
 from django.urls import include
 from django.views.generic import RedirectView
 
-from ietf.meeting import views, views_proceedings
+from ietf.meeting import views, views_proceedings, views_session_request
 from ietf.utils.urls import url
 
 class AgendaRedirectView(RedirectView):
@@ -108,6 +108,8 @@ def get_redirect_url(self, *args, **kwargs):
     url(r'^important-dates.(?P<output_format>ics)$', views.important_dates),
     url(r'^proceedings/meetinghosts/edit/', views_proceedings.edit_meetinghosts),
     url(r'^proceedings/meetinghosts/(?P<host_id>\d+)/logo/$', views_proceedings.meetinghost_logo),
+    url(r'^session/request/%(acronym)s/edit/$' % settings.URL_REGEXPS, views_session_request.edit_request),
+    url(r'^session/request/%(acronym)s/view/$' % settings.URL_REGEXPS, views_session_request.view_request),
 ]
 
 urlpatterns = [
@@ -127,6 +129,13 @@ def get_redirect_url(self, *args, **kwargs):
     url(r'^upcoming/?$', views.upcoming),
     url(r'^upcoming\.ics/?$', views.upcoming_ical),
     url(r'^upcoming\.json/?$', views.upcoming_json),
+    url(r'^session/request/$', views_session_request.list_view),
+    url(r'^session/request/%(acronym)s/new/$' % settings.URL_REGEXPS, views_session_request.new_request),
+    url(r'^session/request/%(acronym)s/approve/$' % settings.URL_REGEXPS, views_session_request.approve_request),
+    url(r'^session/request/%(acronym)s/no_session/$' % settings.URL_REGEXPS, views_session_request.no_session),
+    url(r'^session/request/%(acronym)s/cancel/$' % settings.URL_REGEXPS, views_session_request.cancel_request),
+    url(r'^session/request/%(acronym)s/confirm/$' % settings.URL_REGEXPS, views_session_request.confirm),
+    url(r'^session/request/status/$', views_session_request.status),
     url(r'^session/(?P<session_id>\d+)/agenda_materials$', views.session_materials),
     url(r'^session/(?P<session_id>\d+)/cancel/?', views.cancel_session),
     url(r'^session/(?P<session_id>\d+)/edit/?', views.edit_session),
@@ -140,4 +149,3 @@ def get_redirect_url(self, *args, **kwargs):
     url(r'^(?P<num>\d+)/', include(safe_for_all_meeting_types)),
     url(r'^(?P<num>interim-[a-z0-9-]+)/', include(safe_for_all_meeting_types)),
 ]
-