diff --git a/modoboa/admin/fixtures/test_content.json b/modoboa/admin/fixtures/test_content.json index 27301a1dc..b6bd99c83 100644 --- a/modoboa/admin/fixtures/test_content.json +++ b/modoboa/admin/fixtures/test_content.json @@ -1 +1 @@ -[{"pk": 2, "model": "admin.user", "fields": {"username": "user@test.com", "is_active": "True", "is_superuser": "False", "password": "{PLAIN}toto", "groups": [2]}},{"pk": 3, "model": "admin.user", "fields": {"username": "admin@test.com", "is_active": "True", "is_superuser": "False", "password": "{PLAIN}toto", "groups": [1]}},{"pk": 4, "model": "admin.user", "fields": {"username": "superadmin@test.com", "is_active": "True", "is_superuser": "True", "password": "{PLAIN}toto", "groups": []}},{"pk": 1, "model": "admin.ObjectDates", "fields": {"creation": "2011-09-07 09:27:07.579603", "last_modification": "2011-09-07 09:27:07.579603"}}, {"pk": 2, "model": "admin.ObjectDates", "fields": {"creation": "2011-09-07 09:27:07.579603", "last_modification": "2011-09-07 09:27:07.579603"}}, {"pk": 3, "model": "admin.ObjectDates", "fields": {"creation": "2011-09-07 09:27:07.579603", "last_modification": "2011-09-07 09:27:07.579603"}}, {"pk": 1, "model": "admin.Domain", "fields": {"name" : "test.com", "quota" : "100", "dates": "1"}}, {"pk": 1, "model": "admin.Mailbox", "fields": {"address": "user", "domain": "1", "dates": "1", "quota": "10", "user": "2"}}, {"pk": 2, "model": "admin.Mailbox", "fields": {"address": "admin", "domain": "1", "dates": "2", "quota": "10", "user": "3"}}, {"pk": 3, "model": "admin.Mailbox", "fields": {"address": "superadmin", "domain": "1", "dates": "3", "quota": "10", "user": "4"}}, {"pk": "user@test.com", "model": "admin.Quota", "fields": {"username": "user@test.com", "bytes": 0, "messages": 0}}, {"pk": "admin@test.com", "model": "admin.Quota", "fields": {"username": "admin@test.com", "bytes": 0, "messages": 0}}, {"pk": "superadmin@test.com", "model": "admin.Quota", "fields": {"username": "superadmin@test.com", "bytes": 0, "messages": 0}}] +[{"pk": 2, "model": "admin.user", "fields": {"username": "user@test.com", "is_active": "True", "is_superuser": "False", "password": "{PLAIN}toto", "groups": [2]}},{"pk": 3, "model": "admin.user", "fields": {"username": "admin@test.com", "is_active": "True", "is_superuser": "False", "password": "{PLAIN}toto", "groups": [1]}},{"pk": 4, "model": "admin.user", "fields": {"username": "superadmin@test.com", "is_active": "True", "is_superuser": "True", "password": "{PLAIN}toto", "groups": []}},{"pk": 1, "model": "admin.ObjectDates", "fields": {"creation": "2011-09-07 09:27:07.579603", "last_modification": "2011-09-07 09:27:07.579603"}}, {"pk": 2, "model": "admin.ObjectDates", "fields": {"creation": "2011-09-07 09:27:07.579603", "last_modification": "2011-09-07 09:27:07.579603"}}, {"pk": 3, "model": "admin.ObjectDates", "fields": {"creation": "2011-09-07 09:27:07.579603", "last_modification": "2011-09-07 09:27:07.579603"}}, {"pk": 1, "model": "admin.Domain", "fields": {"name" : "test.com", "quota" : "100", "dates": "1"}}, {"pk": 1, "model": "admin.Mailbox", "fields": {"address": "user", "domain": "1", "dates": "1", "quota": "10", "user": "2"}}, {"pk": 2, "model": "admin.Mailbox", "fields": {"address": "admin", "domain": "1", "dates": "2", "quota": "10", "user": "3"}}, {"pk": 3, "model": "admin.Mailbox", "fields": {"address": "superadmin", "domain": "1", "dates": "3", "quota": "10", "user": "4"}}, {"pk": "user@test.com", "model": "admin.Quota", "fields": {"username": "user@test.com", "bytes": 0, "messages": 0}}, {"pk": "admin@test.com", "model": "admin.Quota", "fields": {"username": "admin@test.com", "bytes": 0, "messages": 0}}, {"pk": "superadmin@test.com", "model": "admin.Quota", "fields": {"username": "superadmin@test.com", "bytes": 0, "messages": 0}},{"pk": 2, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "user"], "object_id": 2}},{"pk": 3, "model": "admin.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["admin", "user"], "object_id": 3}}] diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index f67a6467e..50ecfdef6 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -54,7 +54,7 @@ class User(DUser): super(User, self).__init__(*args, **kwargs) def __unicode__(self): - return u"%s %s" % (self.first_name, self.last_name) + return self.fullname def delete(self, fromuser, keep_mb_dir, *args, **kwargs): """Custom delete method @@ -195,7 +195,7 @@ class User(DUser): @property def fullname(self): if self.first_name != "": - return "%s %s" % (self.first_name, self.last_name) + return u"%s %s" % (self.first_name, self.last_name) return self.username @property diff --git a/modoboa/lib/tests.py b/modoboa/lib/tests.py index b39f27c7b..d99d2e6a1 100644 --- a/modoboa/lib/tests.py +++ b/modoboa/lib/tests.py @@ -4,7 +4,8 @@ from django.test import TestCase from django.test.client import Client from django.utils import simplejson from django import forms -import parameters +from django.core.urlresolvers import reverse +from modoboa.lib import parameters class ModoTestCase(TestCase): @@ -34,8 +35,8 @@ class ExtTestCase(ModoTestCase): def setUp(self, *args, **kwargs): super(ExtTestCase, self).setUp(*args, **kwargs) - self.clt.get("/modoboa/admin/settings/extensions/") - self.clt.post("/modoboa/admin/settings/extensions/save/", + self.clt.get(reverse("modoboa.admin.views.viewextensions")) + self.clt.post(reverse("modoboa.admin.views.saveextensions"), {"select_%s" % self.name : "1"})