Skip to content

Commit accbf3d

Browse files
committed
Cleaned up some exceptions that were leading to quiet 500s when setting an official agenda.
The secretariat code being reused expects querysets, not lists. Some objects needed to be saved before other functions tried to operate on them. - Legacy-Id: 7201
1 parent 91d0261 commit accbf3d

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

ietf/meeting/models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,9 @@ def vtimezone(self):
208208
def set_official_agenda(self, agenda):
209209
if self.agenda != agenda:
210210
self.agenda = agenda
211+
self.save()
211212
if self.agenda is not None:
212213
self.agenda.sendEmail()
213-
self.save()
214214

215215
class Meta:
216216
ordering = ["-date", ]
@@ -612,9 +612,9 @@ def sendEmail(self):
612612
if session.status.slug == "schedw":
613613
session.status_id = "sched"
614614
session.scheduled = datetime.datetime.now()
615-
import ietf.secr.meetings.views
616-
ietf.secr.meetings.views.send_notification(None, [session])
617615
session.save()
616+
from ietf.secr.meetings.views import send_notification
617+
send_notification(None, Session.objects.filter(id=session.id))
618618

619619
# to be renamed ScheduleTimeslotSessionAssignments (stsa)
620620
class ScheduledSession(models.Model):

ietf/secr/meetings/views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def send_notification(request, sessions):
172172
to_email = sessions[0].requested_by.role_email('chair').address
173173
cc_list = get_cc_list(group, requestinguser)
174174
from_email = ('"IETF Secretariat"','agenda@ietf.org')
175-
if sessions.count() == 1:
175+
if len(sessions) == 1:
176176
subject = '%s - Requested session has been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number)
177177
else:
178178
subject = '%s - Requested sessions have been scheduled for IETF %s' % (group.acronym, sessions[0].meeting.number)
@@ -198,6 +198,8 @@ def send_notification(request, sessions):
198198
context['agenda_note'] = sessions[0].agenda_note
199199
context['session'] = get_initial_session(sessions)
200200
context['session_info'] = session_info
201+
context['group'] = group
202+
context['login'] = sessions[0].requested_by
201203

202204
send_mail(request,
203205
to_email,

0 commit comments

Comments
 (0)