External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-551 Removed extra empty/blank option from choices.

Browse Source
This commit is contained in:
Chris Church
2013-10-31 18:36:57 -04:00
parent 271a2c0f06
commit e6e34c3afc
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/serializers.py
View File

@@ -16,6 +16,7 @@ from django.contrib.auth import authenticate
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.db.models.fields import BLANK_CHOICE_DASH
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@@ -72,6 +73,16 @@ SUMMARIZABLE_FK_FIELDS = {
class ChoiceField(fields.ChoiceField): class ChoiceField(fields.ChoiceField):
def __init__(self, *args, **kwargs):
super(ChoiceField, self).__init__(*args, **kwargs)
if not self.required:
# Remove extra blank option if one is already present (for writable
# field) or if present at all for read-only fields.
if ([x[0] for x in self.choices].count(u'') > 1 or self.read_only) \
and BLANK_CHOICE_DASH[0] in self.choices:
self.choices = [x for x in self.choices
if x != BLANK_CHOICE_DASH[0]]
def metadata(self): def metadata(self):
metadata = super(ChoiceField, self).metadata() metadata = super(ChoiceField, self).metadata()
if self.choices: if self.choices: