From 1865da34779352b2b171099704eede1b29525325 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 22 May 2017 18:14:38 +0100 Subject: [PATCH 1/2] Write a test covering the representation of the model --- tests/tests.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tests.py b/tests/tests.py index 572b437..0588f2d 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -99,3 +99,7 @@ class AdminInterfaceTestCase(TestCase): rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}') self.assertEqual(rendered, 'Django') + def test_repr(self): + theme = Theme.get_active_theme() + self.assertEqual( "{0}".format(theme), 'Django' ) + From f6c8e84b7b47c8753ead85eedc6d410bf7927a5a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 22 May 2017 18:21:51 +0100 Subject: [PATCH 2/2] Fix representation of Theme models on Python 3 --- admin_interface/models.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/admin_interface/models.py b/admin_interface/models.py index f5fcbb7..c2c446e 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -1,14 +1,17 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals from django.core.files import File from django.db import models from django.db.models.signals import post_delete, post_save +from django.utils.encoding import python_2_unicode_compatible, force_text from colorfield.fields import ColorField import os +@python_2_unicode_compatible class Theme(models.Model): @staticmethod @@ -134,9 +137,8 @@ class Theme(models.Model): verbose_name = 'Theme' verbose_name_plural = 'Themes' - def __unicode__(self): - - return unicode(u'%s' % (self.name, )) + def __str__(self): + return force_text(self.name) post_delete.connect(Theme.post_delete_handler, sender = Theme)