Skip to content

chore: merge feat/sreq to main #9697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 5 commits into from
Oct 10, 2025
Merged

chore: merge feat/sreq to main #9697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20bd3ab
refactor: move session request tool to ietf.meeting and restyle (#9617)
rpcross Oct 7, 2025
9b11cf5
fix: don't show inactive constraints label when there are none (#9680)
rpcross Oct 7, 2025
03fdd1a
Merge branch 'main' into feat/sreq
jennifer-richards Oct 7, 2025
9a903ef
chore: remove unused utility
rjsparks Oct 8, 2025
93d8280
fix: add test for secr main menu page (#9693)
rpcross Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
333 changes: 330 additions & 3 deletions ietf/meeting/forms.py
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions ietf/secr/sreq/templatetags/ams_filters.py → ietf/meeting/templatetags/ams_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright The IETF Trust 2025, All Rights Reserved

from django import template
from ietf.person.models import Person

Expand Down
314 changes: 143 additions & 171 deletions ietf/secr/sreq/tests.py → ietf/meeting/tests_session_requests.py
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ietf/meeting/tests_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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,
Expand Down
14 changes: 11 additions & 3 deletions ietf/meeting/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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):
Expand Down Expand Up @@ -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 = [
Expand All @@ -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),
Expand All @@ -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)),
]

Loading
Loading