From 8496c7938a1292d0c19ef0a704c40db880a13ef7 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 5 Aug 2020 09:50:25 +0000 Subject: [PATCH] Set Schedule.origin when copying schedule - Legacy-Id: 18338 --- ietf/meeting/tests_views.py | 3 +++ ietf/meeting/views.py | 1 + 2 files changed, 4 insertions(+) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 1bc427a95..8bc709ef2 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -1130,12 +1130,15 @@ class EditTests(TestCase): r = self.client.post(url, { 'name': "newtest", 'public': "on", + 'notes': "New test", }) self.assertNoFormPostErrors(r) new_schedule = Schedule.objects.get(meeting=meeting, owner__user__username='secretary', name='newtest') self.assertEqual(new_schedule.public, True) self.assertEqual(new_schedule.visible, False) + self.assertEqual(new_schedule.notes, "New test") + self.assertEqual(new_schedule.origin, meeting.schedule) old_assignments = {(a.session_id, a.timeslot_id) for a in SchedTimeSessAssignment.objects.filter(schedule=meeting.schedule)} for a in SchedTimeSessAssignment.objects.filter(schedule=new_schedule): diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 94d4cb2b3..243c73c85 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -395,6 +395,7 @@ def copy_meeting_schedule(request, num, owner, name): new_schedule = form.save(commit=False) new_schedule.meeting = schedule.meeting new_schedule.owner = request.user.person + new_schedule.origin = schedule new_schedule.save() # keep a mapping so that extendedfrom references can be chased