Skip to content
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

Jump to bottom

fix: link from session details to group about #6134

Merged
merged 1 commit into from
Aug 12, 2023
Merged

fix: link from session details to group about #6134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions ietf/meeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,7 +2432,8 @@ def session_details(request, num, acronym):

# we somewhat arbitrarily use the group of the last session we get from
# get_sessions() above when checking can_manage_session_materials()
can_manage = can_manage_session_materials(request.user, session.group, session)
group = session.group
can_manage = can_manage_session_materials(request.user, group, session)
can_view_request = can_view_interim_request(meeting, request.user)

scheduled_sessions = [s for s in sessions if s.current_status == 'sched']
Expand All @@ -2450,7 +2451,7 @@ def session_details(request, num, acronym):
'unscheduled_sessions':unscheduled_sessions ,
'pending_suggestions' : pending_suggestions,
'meeting' :meeting ,
'acronym' :acronym,
'group': group,
'is_materials_manager' : session.group.has_role(request.user, session.group.features.matman_roles),
'can_manage_materials' : can_manage,
'can_view_request': can_view_request,
Expand Down
10 changes: 5 additions & 5 deletions ietf/templates/meeting/session_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin ietf_filters static %}
{% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
{% block title %}{{ meeting }} : {{ group.acronym }}{% endblock %}
{% block morecss %}
.drag-handle {
cursor: move;
Expand All @@ -12,13 +12,13 @@
<h1>
{{ meeting }}
<br>
<small class="text-body-secondary">{{ acronym }}</small>
<small class="text-body-secondary"><a href="{% url 'ietf.group.views.group_about' acronym=group.acronym %}">{{ group.acronym }}</a>: {{ group.name }}</small>
</h1>
{% if meeting.start_datetime >= thisweek %}
<a class="regular float-end"
title="icalendar entry for {{ acronym }}@{{ meeting.number }}"
aria-label="icalendar entry for {{ acronym }}@{{ meeting.number }}"
href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number acronym=acronym %}">
title="icalendar entry for {{ group.acronym }}@{{ meeting.number }}"
aria-label="icalendar entry for {{ group.acronym }}@{{ meeting.number }}"
href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number acronym=group.acronym %}">
<i class="bi bi-calendar"></i>
</a>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/meeting/session_details_panel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ <h3 class="mt-4">Notes and recordings</h3>
{% if session.video_stream_url %}
<tr>
<td>
<a href="https://www.meetecho.com/ietf{{ meeting.number }}/recordings#{{ acronym.upper }}">
<a href="https://www.meetecho.com/ietf{{ meeting.number }}/recordings#{{ group.acronym.upper }}">
<i class="bi bi-file-slides"></i> Session recording
</a>
</td>
Expand Down
Loading