Skip to content

Django 1.10 compat #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Django 1.10 compat #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5370a2
Fix runtests.py settings
thomasgoirand Jul 26, 2016
afe9b64
Add new 1.10 compat fixtures
thomasgoirand Jul 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions bootstrapform/fixtures/basic_dj110.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<div class="form-group">
<label class="control-label " for="id_char_field">Char field</label>
<div class=" ">
<input class=" form-control" id="id_char_field" name="char_field" required type="text" />
</div>
</div>

<div class="form-group">
<label class="control-label " for="id_choice_field">Choice field</label>
<div class=" ">
<select class=" form-control" id="id_choice_field" name="choice_field" required>
<option value="0">Zero</option>
<option value="1">One</option>
<option value="2">Two</option>
</select>
</div>
</div>

<div class="form-group">
<label class="control-label ">Radio choice</label>
<div class="">
<div class="radio">
<label>
<input id="id_radio_choice_0" name="radio_choice" type="radio" value="0" />
Zero
</label>
</div>

<div class="radio">
<label>
<input id="id_radio_choice_1" name="radio_choice" type="radio" value="1" />
One
</label>
</div>

<div class="radio">
<label>
<input id="id_radio_choice_2" name="radio_choice" type="radio" value="2" />
Two
</label>
</div>
</div>
</div>

<div class="form-group">
<label class="control-label " for="id_multiple_choice">Multiple choice</label>
<div class=" ">
<select multiple="multiple" class=" form-control" id="id_multiple_choice" name="multiple_choice" required>
<option value="0">Zero</option>
<option value="1">One</option>
<option value="2">Two</option>
</select>
</div>
</div>

<div class="form-group">
<label class="control-label " for="id_multiple_checkbox">Multiple checkbox</label>
<div class=" multiple-checkbox">
<ul id="id_multiple_checkbox">
<li><label for="id_multiple_checkbox_0"><input id="id_multiple_checkbox_0" name="multiple_checkbox" required type="checkbox" value="0" /> Zero</label></li>
<li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" required type="checkbox" value="1" /> One</label></li>
<li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" required type="checkbox" value="2" /> Two</label></li>
</ul>
</div>
</div>

<div class="form-group">
<label class="control-label " for="id_file_fied">File fied</label>

<div class=" ">
<input id="id_file_fied" name="file_fied" required type="file" />
</div>
</div>

<div class="form-group">
<label class="control-label " for="id_password_field">Password field</label>

<div class=" ">
<input class=" form-control" id="id_password_field" name="password_field" required type="password" />
</div>
</div>

<div class="form-group">
<label class="control-label " for="id_textarea">Textarea</label>
<div class=" ">
<textarea class=" form-control" cols="40" id="id_textarea" name="textarea" required rows="10">
</textarea>
</div>
</div>

<div class="form-group">
<div class="">
<div class="checkbox">
<label >
<input id="id_boolean_field" name="boolean_field" required type="checkbox" /> <span>Boolean field</span>
</label>
</div>
</div>
</div>
102 changes: 102 additions & 0 deletions bootstrapform/fixtures/horizontal_dj110.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_char_field">Char field</label>

<div class=" col-sm-10 col-lg-10 ">
<input class=" form-control" id="id_char_field" name="char_field" required type="text" />
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_choice_field">Choice field</label>

<div class=" col-sm-10 col-lg-10 ">
<select class=" form-control" id="id_choice_field" name="choice_field" required>
<option value="0">Zero</option>
<option value="1">One</option>
<option value="2">Two</option>
</select>
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 ">Radio choice</label>

<div class=" col-sm-10 col-lg-10">
<div class="radio">
<label>
<input id="id_radio_choice_0" name="radio_choice" type="radio" value="0" />
Zero
</label>
</div>
<div class="radio">
<label>
<input id="id_radio_choice_1" name="radio_choice" type="radio" value="1" />
One
</label>
</div>
<div class="radio">
<label>
<input id="id_radio_choice_2" name="radio_choice" type="radio" value="2" />
Two
</label>
</div>
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_multiple_choice">Multiple choice</label>

<div class=" col-sm-10 col-lg-10 ">
<select multiple="multiple" class=" form-control" id="id_multiple_choice" name="multiple_choice" required>
<option value="0">Zero</option>
<option value="1">One</option>
<option value="2">Two</option>
</select>
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_multiple_checkbox">Multiple checkbox</label>
<div class=" col-sm-10 col-lg-10 multiple-checkbox">
<ul id="id_multiple_checkbox">
<li><label for="id_multiple_checkbox_0"><input id="id_multiple_checkbox_0" name="multiple_checkbox" required type="checkbox" value="0" /> Zero</label></li>
<li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" required type="checkbox" value="1" /> One</label></li>
<li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" required type="checkbox" value="2" /> Two</label></li>
</ul>
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_file_fied">File fied</label>

<div class=" col-sm-10 col-lg-10 ">
<input id="id_file_fied" name="file_fied" required type="file" />
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_password_field">Password field</label>

<div class=" col-sm-10 col-lg-10 ">
<input class=" form-control" id="id_password_field" name="password_field" required type="password" />
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_textarea">Textarea</label>

<div class=" col-sm-10 col-lg-10 ">
<textarea class=" form-control" cols="40" id="id_textarea" name="textarea" required rows="10">
</textarea>
</div>
</div>

<div class="form-group">
<div class=" col-sm-offset-2 col-sm-10 col-lg-offset-2 col-lg-10">
<div class="checkbox">
<label >
<input id="id_boolean_field" name="boolean_field" required type="checkbox" /> <span>Boolean field</span>
</label>
</div>
</div>
</div>
8 changes: 6 additions & 2 deletions bootstrapform/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ def test_basic_form(self):
html = Template("{% load bootstrap %}{{ form|bootstrap }}").render(Context({'form': form}))


if StrictVersion(django.get_version()) >= StrictVersion('1.7'):
if StrictVersion(django.get_version()) >= StrictVersion('1.10b1'):
fixture = 'basic_dj110.html'
elif StrictVersion(django.get_version()) >= StrictVersion('1.7'):
fixture = 'basic.html'
elif StrictVersion(django.get_version()) >= StrictVersion('1.6'):
fixture = 'basic_dj16.html'
Expand All @@ -61,7 +63,9 @@ def test_horizontal_form(self):

html = Template("{% load bootstrap %}{{ form|bootstrap_horizontal }}").render(Context({'form': form}))

if StrictVersion(django.get_version()) >= StrictVersion('1.7'):
if StrictVersion(django.get_version()) >= StrictVersion('1.10b1'):
fixture = 'horizontal_dj110.html'
elif StrictVersion(django.get_version()) >= StrictVersion('1.7'):
fixture = 'horizontal.html'
elif StrictVersion(django.get_version()) >= StrictVersion('1.6'):
fixture = 'horizontal_dj16.html'
Expand Down
23 changes: 22 additions & 1 deletion runtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#!/usr/bin/env python

import os
import sys
import django
from os.path import dirname, abspath

from django.conf import settings


local_path = lambda path: os.path.join(os.path.dirname(__file__), path)

settings.configure(
DATABASES = {
Expand Down Expand Up @@ -34,6 +35,26 @@
SITE_ID=1,
DEBUG=False,
ROOT_URLCONF='',

TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [local_path('templates'), ],
'OPTIONS': {
'debug': False,
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
'loaders': [
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
],
},
},
]
)


Expand Down