Provide navigation for session requests from the meeting tab.

- Legacy-Id: 10759
This commit is contained in:
Robert Sparks 2016-02-01 16:32:36 +00:00
parent a1a518a4bc
commit 0db79011f2
3 changed files with 23 additions and 5 deletions

View file

@ -59,6 +59,7 @@ from ietf.group.utils import can_manage_materials, get_group_or_404
from ietf.utils.pipe import pipe
from ietf.settings import MAILING_LIST_INFO_URL
from ietf.mailtrigger.utils import gather_relevant_expansions
from ietf.ietfauth.utils import has_role
def roles(group, role_name):
return Role.objects.filter(group=group, name=role_name).select_related("email", "person")
@ -764,10 +765,13 @@ def meetings(request, acronym=None, group_type=None):
else:
past.append(s)
can_edit = has_role(request.user,["Secretariat","Area Director"]) or group.has_role(request.user,["Chair","Secretary"])
return render(request,'group/meetings.html',
construct_group_menu_context(request, group, "meetings", group_type, {
'group':group,
'future':future,
'in_progress':in_progress,
'past':past,
'can_edit':can_edit,
}))

View file

@ -18,10 +18,16 @@
{% else %}
{{s.status}}
{% endif %}
{% if show_request and s.meeting.type.slug == 'ietf' %}
{% if can_edit %}
<br>
<a class="btn btn-default btn-xs" href="{% url 'sessions_view' num=s.meeting.number acronym=s.group.acronym %}">Edit Session Request</a>
{% endif %}
{% endif %}
</td>
<td>{% if s.minutes %}<a href="{{ s.minutes.get_absolute_url }}">Minutes</a>{% endif %}</td>
<td>{% if s.agenda %}<a href="{{ s.agenda.get_absolute_url }}">Agenda</a>{% endif %}</td>
<td><a href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">Materials</a></td>
<td>{% if s.minutes %}<a class="btn btn-default btn-xs" href="{{ s.minutes.get_absolute_url }}">Minutes</a>{% endif %}</td>
<td>{% if s.agenda %}<a class="btn btn-default btn-xs" href="{{ s.agenda.get_absolute_url }}">Agenda</a>{% endif %}</td>
<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>
{% endfor %}
</tbody>
</table>

View file

@ -6,13 +6,21 @@
{% block group_content %}
{% origin %}
<div class="buttonlist">
<a class="btn btn-default" href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
{% if can_edit %}
<a class="btn btn-default" href="{% url 'ietf.secr.sreq.views.main' %}">Request a session</a>
{% endif %}
</div>
{% if in_progress %}
<div class="panel panel-default" id="inprogressmeets">
<div class="panel-heading">
Meetings in progress
</div>
<div class="panel-body">
{% with in_progress as sessions %}
{% with sessions=in_progress show_request=True %}
{% include "group/meetings-row.html" %}
{% endwith %}
</div>
@ -25,7 +33,7 @@
Future Meetings
</div>
<div class="panel-body">
{% with future as sessions %}
{% with sessions=future show_request=True %}
{% include "group/meetings-row.html" %}
{% endwith %}
</div>