Briq
/
django-admin-interface
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed default theme logo reset if the logo exists

pull/17/head
Fabio Caccamo 2017-05-16 18:36:39 +02:00
parent c3cf8e4d10
commit a09e13fb00
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin_interface/models.py
View File

@ -107,7 +107,7 @@ class Theme(models.Model):
def set_default_logo(self):
if self.logo and os.path.isfile(self.logo.url):
if self.logo and os.path.isfile(self.logo.path):
return
logo_filename = 'logo-django.svg'

18
tests/tests.py
View File

@ -66,6 +66,24 @@ class AdminInterfaceTestCase(TestCase):
Theme.objects.filter( pk = Theme.get_active_theme().pk ).delete()
self.assertEqual( Theme.get_active_theme().pk, 1 )
def test_default_theme_logo_created_if_deleted(self):
Theme.objects.all().delete()
theme = Theme.get_active_theme()
theme.logo = ''
theme.save()
theme = Theme.get_active_theme()
self.assertNotEqual( theme.logo, None )
def test_default_theme_logo_not_created_if_not_deleted(self):
Theme.objects.all().delete()
theme = Theme.get_active_theme()
self.assertNotEqual( theme.logo, None )
logo_url = theme.logo.url
theme = Theme.get_active_theme()
self.assertEqual( theme.logo.url, logo_url )
def test_last_theme_activated_on_multiple_themes_created(self):
Theme.objects.all().delete()