Skip to content

Commit 6ecad87

Browse files
committed
Fixed model items display (closes #13)
1 parent b841011 commit 6ecad87

File tree

4 files changed

+30
-17
lines changed

4 files changed

+30
-17
lines changed

example/example/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
class Cat(models.Model):
55
name = models.CharField(max_length=64, null=False, blank=False)
66
favorite_foods = models.ManyToManyField('Food', related_name='loved_by')
7-
owner = models.ForeignKey('Person', null=False, blank=False)
7+
owner = models.ForeignKey('Person', null=False, blank=False, on_delete=models.CASCADE)
88

99
def __unicode__(self):
1010
return self.name

example/example/settings.py

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,32 @@
4545
'example'
4646
]
4747

48-
MIDDLEWARE_CLASSES = []
49-
50-
if LooseVersion(get_version()) >= LooseVersion('1.8'):
51-
MIDDLEWARE_CLASSES.append('django.middleware.security.SecurityMiddleware')
52-
53-
MIDDLEWARE_CLASSES.extend([
54-
'django.contrib.sessions.middleware.SessionMiddleware',
55-
'django.middleware.common.CommonMiddleware',
56-
'django.middleware.csrf.CsrfViewMiddleware',
57-
'django.contrib.auth.middleware.AuthenticationMiddleware',
58-
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
59-
'django.contrib.messages.middleware.MessageMiddleware',
60-
'django.middleware.clickjacking.XFrameOptionsMiddleware',
61-
])
48+
if LooseVersion(get_version()) >= LooseVersion('2.0'):
49+
MIDDLEWARE = [
50+
'django.middleware.security.SecurityMiddleware',
51+
'django.contrib.sessions.middleware.SessionMiddleware',
52+
'django.middleware.common.CommonMiddleware',
53+
'django.middleware.csrf.CsrfViewMiddleware',
54+
'django.contrib.auth.middleware.AuthenticationMiddleware',
55+
'django.contrib.messages.middleware.MessageMiddleware',
56+
'django.middleware.clickjacking.XFrameOptionsMiddleware',
57+
]
58+
else:
59+
MIDDLEWARE_CLASSES = []
60+
61+
if LooseVersion(get_version()) >= LooseVersion('1.8'):
62+
MIDDLEWARE_CLASSES.append('django.middleware.security.SecurityMiddleware')
63+
64+
MIDDLEWARE_CLASSES.extend([
65+
'django.contrib.sessions.middleware.SessionMiddleware',
66+
'django.middleware.common.CommonMiddleware',
67+
'django.middleware.csrf.CsrfViewMiddleware',
68+
'django.contrib.auth.middleware.AuthenticationMiddleware',
69+
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
70+
'django.contrib.messages.middleware.MessageMiddleware',
71+
'django.middleware.clickjacking.XFrameOptionsMiddleware',
72+
])
73+
6274

6375
ROOT_URLCONF = 'example.urls'
6476

searchableselect/templates/searchableselect/select.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div id="{{ field_id }}-chips" class="chips">
88
{% for value in values %}
99
<div class="chip">
10-
{{ value.name }}
10+
{{ value }}
1111
<input type="hidden" name="{{ field_name }}" value="{{ value.pk }}" />
1212
</div>
1313
{% endfor %}

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
py27-{17,18,19,110,111}
4-
py35-{18,19,110,111}
4+
py35-{18,19,110,111,20}
55

66
[testenv]
77
usedevelop = true
@@ -13,6 +13,7 @@ deps =
1313
19: Django >= 1.9, < 1.10
1414
110: Django >= 1.10, < 1.11
1515
111: Django >= 1.11, < 1.12
16+
20: Django >= 2.0, < 2.1
1617
commands =
1718
python example/manage.py collectstatic --noinput -v 0
1819
coverage run -p example/manage.py test example -v 3

0 commit comments

Comments
 (0)