kumi/django-multiselectfield
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed get_field_display method for None value.

Browse source
This commit is contained in:
Vasyl Stanislavchuk 2014-07-21 14:52:30 +03:00
parent 009d6c1c52
commit cbfe2ee9bd
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
multiselectfield/db/fields.py
View file

@ -111,14 +111,15 @@ class MultiSelectField(models.CharField):
fieldname = name fieldname = name
choicedict = dict(self.choices) choicedict = dict(self.choices)
display = [] display = []
for value in getattr(obj, fieldname): if getattr(obj, fieldname):
item_display = choicedict.get(value, None) for value in getattr(obj, fieldname):
if item_display is None: item_display = choicedict.get(value, None)
try: if item_display is None:
item_display = choicedict.get(int(value), value) try:
except (ValueError, TypeError): item_display = choicedict.get(int(value), value)
item_display = value except (ValueError, TypeError):
display.append(string_type(item_display)) item_display = value
display.append(string_type(item_display))
return ", ".join(display) return ", ".join(display)
setattr(cls, 'get_%s_display' % self.name, get_display) setattr(cls, 'get_%s_display' % self.name, get_display)