altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [11435] from rcross@amsl.com:

Browse source 
Fix a few things with interim materials management.
 - Legacy-Id: 11438
Note: SVN reference [11435] has been migrated to Git commit f1bb818434c83b4180e9655d062825a5c0016ef8
This commit is contained in:
Henrik Levkowetz 2016-06-21 12:59:10 +00:00
parent 1e50d5dd44
commit cc6096e190
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/secr/proceedings/views.py
View file

@ -397,10 +397,10 @@ def main(request):
meetings = Meeting.objects.filter(type='ietf',date__gt=datetime.datetime.today() - datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS)).order_by('number')
groups = get_my_groups(request.user)
interim_meetings = Meeting.objects.filter(type='interim',session__group__in=groups).order_by('-date')
interim_meetings = Meeting.objects.filter(type='interim',session__group__in=groups,session__status='sched').order_by('-date')
# tac on group for use in templates
for m in interim_meetings:
m.group = m.session_set.all()[0].group
m.group = m.session_set.first().group
# we today's date to see if we're past the submissio cutoff
today = datetime.date.today()
@ -720,7 +720,7 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None):
'''
def redirection_back(meeting, group):
if meeting.type.slug == 'interim':
url = reverse('proceedings_interim', kwargs={'acronym':group.acronym})
url = reverse('proceedings')
else:
url = reverse('proceedings_select', kwargs={'meeting_num':meeting.number})
return HttpResponseRedirect(url)

3
ietf/secr/templates/proceedings/main.html
View file

@ -53,7 +53,8 @@
{% for meeting in interim_meetings %}
<tr class = "{% cycle 'row1' 'row2' %}">
<td><a href="{% url "proceedings_upload_unified" meeting_num=meeting.number acronym=meeting.group.acronym %}">{{ meeting.group.acronym|ljust:"8" }} - {{ meeting.date }}</a></td>
<td>{{ meeting.group.acronym }}</td>
<td><a href="{% url "proceedings_upload_unified" meeting_num=meeting.number acronym=meeting.group.acronym %}">{{ meeting.date }}</a></td>
</tr>
{% endfor %}
</tbody>