Skip to content

Commit 47e33a3

Browse files
committed
Added 'Remote instructions' at the top of interim sesssion pages, and made the 'Meeting Details' button available to the group chairs, not only secretariat.
- Legacy-Id: 17586
1 parent 2634ec7 commit 47e33a3

2 files changed

Lines changed: 22 additions & 2 deletions

File tree

ietf/meeting/views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,6 +1159,7 @@ def session_details(request, num, acronym):
11591159
# we somewhat arbitrarily use the group of the last session we get from
11601160
# get_sessions() above when checking can_manage_session_materials()
11611161
can_manage = can_manage_session_materials(request.user, session.group, session)
1162+
can_view_request = can_view_interim_request(meeting, request.user)
11621163

11631164
scheduled_sessions = [s for s in sessions if s.current_status == 'sched']
11641165
unscheduled_sessions = [s for s in sessions if s.current_status != 'sched']
@@ -1178,6 +1179,7 @@ def session_details(request, num, acronym):
11781179
'acronym' :acronym,
11791180
'is_materials_manager' : session.group.has_role(request.user, session.group.features.matman_roles),
11801181
'can_manage_materials' : can_manage,
1182+
'can_view_request': can_view_request,
11811183
'thisweek': datetime.date.today()-datetime.timedelta(days=7),
11821184
})
11831185

ietf/templates/meeting/session_details_panel.html

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% load origin ietf_filters %}{% origin %}
1+
{% load origin ietf_filters textfilters %}{% origin %}
22

33
{% for session in sessions %}
44
<h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}
@@ -11,7 +11,7 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
1111
{% if can_manage_materials %}
1212
{% if session.current_status == 'sched' or session.current_status == 'schedw' %}
1313
<div class="buttonlist">
14-
{% if meeting.type_id == 'interim' and user|has_role:"Secretariat" %}
14+
{% if can_view_request %}
1515
<a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">Meeting Details</a>
1616
{% endif %}
1717
</div>
@@ -21,6 +21,24 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
2121
{% endif %}
2222
{% endif %}
2323

24+
{% if meeting.type.slug == 'interim' and session.remote_instructions %}
25+
<div>
26+
<b>Remote instructions:</b>
27+
{% if "https://ietf.webex.com" in session.agenda_note|first_url %}
28+
<a class=""
29+
href="{{ session.agenda_note|first_url }}"
30+
title="Webex session"><span class="fa fa-fw fa-phone"></span>
31+
</a>
32+
{% elif "https://ietf.webex.com" in session.remote_instructions|first_url %}
33+
<a class=""
34+
href="{{ session.remote_instructions|first_url }}"
35+
title="Webex session"><span class="fa fa-fw fa-phone"></span>
36+
</a>
37+
{% endif %}
38+
{{ session.remote_instructions }}
39+
</div>
40+
{% endif %}
41+
2442
<div class="panel panel-default">
2543
<div class="panel-heading">Agenda, Minutes, and Bluesheets</div>
2644
<div class="panel-body">

0 commit comments

Comments
 (0)