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
This commit is contained in:
parent
2634ec7bd4
commit
47e33a39f4
|
@ -1159,6 +1159,7 @@ 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)
|
||||
can_view_request = can_view_interim_request(meeting, request.user)
|
||||
|
||||
scheduled_sessions = [s for s in sessions if s.current_status == 'sched']
|
||||
unscheduled_sessions = [s for s in sessions if s.current_status != 'sched']
|
||||
|
@ -1178,6 +1179,7 @@ def session_details(request, num, acronym):
|
|||
'acronym' :acronym,
|
||||
'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,
|
||||
'thisweek': datetime.date.today()-datetime.timedelta(days=7),
|
||||
})
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% load origin ietf_filters %}{% origin %}
|
||||
{% load origin ietf_filters textfilters %}{% origin %}
|
||||
|
||||
{% for session in sessions %}
|
||||
<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 @@
|
|||
{% if can_manage_materials %}
|
||||
{% if session.current_status == 'sched' or session.current_status == 'schedw' %}
|
||||
<div class="buttonlist">
|
||||
{% if meeting.type_id == 'interim' and user|has_role:"Secretariat" %}
|
||||
{% if can_view_request %}
|
||||
<a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">Meeting Details</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
@ -21,6 +21,24 @@
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if meeting.type.slug == 'interim' and session.remote_instructions %}
|
||||
<div>
|
||||
<b>Remote instructions:</b>
|
||||
{% if "https://ietf.webex.com" in session.agenda_note|first_url %}
|
||||
<a class=""
|
||||
href="{{ session.agenda_note|first_url }}"
|
||||
title="Webex session"><span class="fa fa-fw fa-phone"></span>
|
||||
</a>
|
||||
{% elif "https://ietf.webex.com" in session.remote_instructions|first_url %}
|
||||
<a class=""
|
||||
href="{{ session.remote_instructions|first_url }}"
|
||||
title="Webex session"><span class="fa fa-fw fa-phone"></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{{ session.remote_instructions }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Agenda, Minutes, and Bluesheets</div>
|
||||
<div class="panel-body">
|
||||
|
|
Loading…
Reference in a new issue