Merge pull request #16 from mbourqui/fix/#14

Fix/#14

Author: mbourqui

echoices/fields.py

@@ -59,8 +59,9 @@ def to_python(self, value):
         return self.echoices[value]
 
     def get_prep_value(self, value):
-        if value:
+        if isinstance(value, self.echoices):
             return value.value
+        assert value in self.echoices.values() or value in ['', None]
         return value
 
     def deconstruct(self):

echoices/tests/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from .models import TestCharChoicesModel
+
+admin.site.register(TestCharChoicesModel)

echoices/tests/settings.py

@@ -27,16 +27,17 @@
     },
 }
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.common.CommonMiddleware',
 ]
+MIDDLEWARE_CLASSES = MIDDLEWARE  # Django < 1.10
 
 LANGUAGE_CODE = 'en'
 
-# ROOT_URLCONF = 'echoices.tests.urls'
+ROOT_URLCONF = 'echoices.tests.urls'
 
 # MEDIA CONFIGURATION
 # ------------------------------------------------------------------------------

echoices/tests/tests.py

@@ -4,6 +4,7 @@
 from distutils.version import StrictVersion
 
 from django import get_version as django_version
+from django.contrib.auth.models import User
 from django.db import models
 from django.template import Context, Template
 from django.test import TestCase
@@ -253,6 +254,19 @@ def test_create_instance_default(self):
         self.assertIs(instance._meta.fields[1].get_default(), ETestStrChoices.FIELD1)
         instance.delete()
 
+    def test_update(self):
+        instance = TestEChoiceFieldEStrChoicesModel.objects.create(choice=ETestStrChoices.FIELD1)
+        choice = instance.choice
+        self.assertIsInstance(choice, ETestStrChoices)
+        self.assertIs(choice, ETestStrChoices.FIELD1)
+        instance.choice = ETestStrChoices.FIELD2
+        instance.save()
+        instance = TestEChoiceFieldEStrChoicesModel.objects.get(pk=1)
+        choice = instance.choice
+        self.assertIsInstance(choice, ETestStrChoices)
+        self.assertIs(choice, ETestStrChoices.FIELD2)
+        instance.delete()
+
 
 class ChoiceIntFieldTest(TestCase):
     def test_create_empty_instance(self):
@@ -444,3 +458,20 @@ def test_iteration(self):
             self.assertIn(e.name, rendered)
             self.assertIn(e.value, rendered)
             self.assertIn(e.label, rendered)
+
+
+class AdminTest(TestCase):
+    def setUp(self):
+        User.objects.create_superuser('admin', 'admin@tests.com', 'admin')
+        self.client.login(username='admin', password='admin')
+
+    def test_admin(self):
+        self.assertEqual(self.client.get('/admin/').status_code, 200)
+        self.assertEqual(self.client.get('/admin/tests/').status_code, 200)
+
+    def test_admin_testcharchoicesmodel(self):
+        TestCharChoicesModel.objects.create(choice=ETestCharChoices.FIELD1.value)
+        for param in ['', '?choice__exact=u']:
+            response = self.client.get('/admin/tests/testcharchoicesmodel/' + param)
+            self.assertEqual(response.status_code, 200)
+            self.assertInHTML('<p class="paginator">1 test char choices model</p>', response.rendered_content)

echoices/tests/urls.py

@@ -0,0 +1,6 @@
+from django.conf.urls import url
+from django.contrib import admin
+
+urlpatterns = [
+    url(r'^admin/', admin.site.urls),
+]