Skip to content

Commit 0db7901

Browse files
committed
Provide navigation for session requests from the meeting tab.
- Legacy-Id: 10759
1 parent a1a518a commit 0db7901

3 files changed

Lines changed: 23 additions & 5 deletions

File tree

ietf/group/info.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
from ietf.utils.pipe import pipe
6060
from ietf.settings import MAILING_LIST_INFO_URL
6161
from ietf.mailtrigger.utils import gather_relevant_expansions
62+
from ietf.ietfauth.utils import has_role
6263

6364
def roles(group, role_name):
6465
return Role.objects.filter(group=group, name=role_name).select_related("email", "person")
@@ -764,10 +765,13 @@ def sort_key(session):
764765
else:
765766
past.append(s)
766767

768+
can_edit = has_role(request.user,["Secretariat","Area Director"]) or group.has_role(request.user,["Chair","Secretary"])
769+
767770
return render(request,'group/meetings.html',
768771
construct_group_menu_context(request, group, "meetings", group_type, {
769772
'group':group,
770773
'future':future,
771774
'in_progress':in_progress,
772775
'past':past,
776+
'can_edit':can_edit,
773777
}))

ietf/templates/group/meetings-row.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,16 @@
1818
{% else %}
1919
{{s.status}}
2020
{% endif %}
21+
{% if show_request and s.meeting.type.slug == 'ietf' %}
22+
{% if can_edit %}
23+
<br>
24+
<a class="btn btn-default btn-xs" href="{% url 'sessions_view' num=s.meeting.number acronym=s.group.acronym %}">Edit Session Request</a>
25+
{% endif %}
26+
{% endif %}
2127
</td>
22-
<td>{% if s.minutes %}<a href="{{ s.minutes.get_absolute_url }}">Minutes</a>{% endif %}</td>
23-
<td>{% if s.agenda %}<a href="{{ s.agenda.get_absolute_url }}">Agenda</a>{% endif %}</td>
24-
<td><a href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">Materials</a></td>
28+
<td>{% if s.minutes %}<a class="btn btn-default btn-xs" href="{{ s.minutes.get_absolute_url }}">Minutes</a>{% endif %}</td>
29+
<td>{% if s.agenda %}<a class="btn btn-default btn-xs" href="{{ s.agenda.get_absolute_url }}">Agenda</a>{% endif %}</td>
30+
<td><a class="btn btn-default btn-xs" href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">Materials</a></td>
2531
{% endfor %}
2632
</tbody>
2733
</table>

ietf/templates/group/meetings.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@
66

77
{% block group_content %}
88
{% origin %}
9+
10+
<div class="buttonlist">
11+
<a class="btn btn-default" href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
12+
{% if can_edit %}
13+
<a class="btn btn-default" href="{% url 'ietf.secr.sreq.views.main' %}">Request a session</a>
14+
{% endif %}
15+
</div>
16+
917
{% if in_progress %}
1018
<div class="panel panel-default" id="inprogressmeets">
1119
<div class="panel-heading">
1220
Meetings in progress
1321
</div>
1422
<div class="panel-body">
15-
{% with in_progress as sessions %}
23+
{% with sessions=in_progress show_request=True %}
1624
{% include "group/meetings-row.html" %}
1725
{% endwith %}
1826
</div>
@@ -25,7 +33,7 @@
2533
Future Meetings
2634
</div>
2735
<div class="panel-body">
28-
{% with future as sessions %}
36+
{% with sessions=future show_request=True %}
2937
{% include "group/meetings-row.html" %}
3038
{% endwith %}
3139
</div>

0 commit comments

Comments
 (0)