diff --git a/.travis.yml b/.travis.yml index 7846c696..abe9a0d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,11 @@ python: - "2.6" - "2.7" env: - - DJANGO=1.4.3 - - DJANGO=1.3.5 - - DJANGO=1.5.0 + - DJANGO=1.4.13 + - DJANGO=1.5.8 + - DJANGO=1.6.5 install: - - pip install argparse --use-mirrors - - pip install -q Django==$DJANGO --use-mirrors + - pip install argparse + - pip install -q Django==$DJANGO + - pip install -q -r requirements.txt script: python quicktest.py helpdesk diff --git a/helpdesk/models.py b/helpdesk/models.py index bb0643e0..e0c8e6c8 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -1194,6 +1194,7 @@ class CustomField(models.Model): empty_selection_list = models.BooleanField( _('Add empty first choice to List?'), + default=False, help_text=_('Only for List: adds an empty first entry to the choices list, which enforces that the user makes an active choice.'), ) diff --git a/quicktest.py b/quicktest.py index d2d3de81..71b3e86b 100644 --- a/quicktest.py +++ b/quicktest.py @@ -22,6 +22,7 @@ class QuickDjangoTest(object): 'django.contrib.admin', 'django.contrib.staticfiles', 'django.contrib.messages', + 'bootstrapform', ) def __init__(self, *args, **kwargs):