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

Changed the telechat date admin to use the 'initial-date' field value instead of the now nonfunctional form.initial dictionary. This may need revisiting under Django 1.11, which has an official api to grab a form's initial values. This fixes a server 500 error on trying to save a non-default telechat date.

Browse source 
- Legacy-Id: 14210
This commit is contained in:
Henrik Levkowetz 2017-10-14 12:08:22 +00:00
parent 9be7d57a03
commit 7931a96460
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/iesg/admin.py
View file

@ -1,5 +1,7 @@
from django.contrib import admin from django.contrib import admin
import debug # pyflakes:ignore
from ietf.doc.models import TelechatDocEvent from ietf.doc.models import TelechatDocEvent
from ietf.iesg.models import TelechatDate, TelechatAgendaItem from ietf.iesg.models import TelechatDate, TelechatAgendaItem
@ -14,7 +16,7 @@ class TelechatDateAdmin(admin.ModelAdmin):
''' '''
super(TelechatDateAdmin, self).save_model(request, obj, form, change) super(TelechatDateAdmin, self).save_model(request, obj, form, change)
if 'date' in form.changed_data: if 'date' in form.changed_data:
old_date = form.initial['date'] old_date = form.data['initial-date']
new_date = form.cleaned_data['date'] new_date = form.cleaned_data['date']
TelechatDocEvent.objects.filter(telechat_date=old_date).update(telechat_date=new_date) TelechatDocEvent.objects.filter(telechat_date=old_date).update(telechat_date=new_date)

2
ietf/iesg/tests.py
View file

@ -415,7 +415,7 @@ class IESGAgendaTests(TestCase):
telechat_date = TelechatDate.objects.get(date=draft.telechat_date()) telechat_date = TelechatDate.objects.get(date=draft.telechat_date())
url = urlreverse('admin:iesg_telechatdate_change', args=(telechat_date.id,)) url = urlreverse('admin:iesg_telechatdate_change', args=(telechat_date.id,))
self.client.login(username="secretary", password="secretary+password") self.client.login(username="secretary", password="secretary+password")
r = self.client.post(url, {'date':today.strftime('%Y-%m-%d')}) r = self.client.post(url, {'initial-date': telechat_date.date.strftime('%Y-%m-%d'), 'date':today.strftime('%Y-%m-%d')})
self.assertRedirects(r, urlreverse('admin:iesg_telechatdate_changelist')) self.assertRedirects(r, urlreverse('admin:iesg_telechatdate_changelist'))
self.assertEqual(draft.telechat_date(),today) self.assertEqual(draft.telechat_date(),today)