Fixed some pyflakes and form initialization issues with the upgrade to DurationField.

- Legacy-Id: 12599
This commit is contained in:
Henrik Levkowetz 2016-12-21 17:03:39 +00:00
parent 67b2fc1107
commit 8e9858379b
4 changed files with 5 additions and 6 deletions

View file

@ -66,7 +66,6 @@ class Serializer(BaseSerializer):
elif isinstance(data, Bundle):
return render("api/dictitem.html", {"data":dict((key, self.to_simple_html(val, options)) for (key, val) in data.data.items())})
elif hasattr(data, 'dehydrated_type'):
debug.show('data')
if getattr(data, 'dehydrated_type', None) == 'related' and data.is_m2m == False:
return render("api/relitem.html", {"fk": data.fk_resource, "val": self.to_simple_html(data.value, options)})
elif getattr(data, 'dehydrated_type', None) == 'related' and data.is_m2m == True:

View file

@ -3,7 +3,6 @@ import codecs
from django import forms
from django.db.models import Q
from django.forms.fields import DurationField
from ietf.doc.models import Document, DocAlias, State, NewRevisionDocEvent
from ietf.doc.utils import get_document_content
@ -14,7 +13,7 @@ from ietf.meeting.helpers import get_next_interim_number, make_materials_directo
from ietf.meeting.helpers import is_meeting_approved, get_next_agenda_name
from ietf.message.models import Message
from ietf.person.models import Person
from ietf.utils.fields import DatepickerDateField
from ietf.utils.fields import DatepickerDateField, DurationField
# need to insert empty option for use in ChoiceField
# countries.insert(0, ('', '-'*9 ))

View file

@ -96,8 +96,9 @@ class MeetingModelForm(forms.ModelForm):
def __init__(self,*args,**kwargs):
super(MeetingModelForm, self).__init__(*args,**kwargs)
for f in [ 'idsubmit_cutoff_warning_days', 'idsubmit_cutoff_time_utc', ]:
self.fields[f].help_text = kwargs['instance']._meta.get_field(f).help_text
if 'instance' in kwargs:
for f in [ 'idsubmit_cutoff_warning_days', 'idsubmit_cutoff_time_utc', ]:
self.fields[f].help_text = kwargs['instance']._meta.get_field(f).help_text
def clean_number(self):
number = self.cleaned_data['number']

View file

@ -4,7 +4,7 @@ import re
import six
import datetime
import debug
import debug # pyflakes:ignore
from django import forms
from django.core.validators import validate_email