diff --git a/dusken/admin.py b/dusken/admin.py index 513e4a9..9d2bd3a 100644 --- a/dusken/admin.py +++ b/dusken/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from django.contrib.auth.models import User -from dusken.models import Member, Institution +from dusken.models import Member, Institution, Address, Country class MemberAdmin(admin.ModelAdmin): exclude = ( 'password', 'last_login', ) @@ -11,3 +11,5 @@ class InstitutionAdmin(admin.ModelAdmin): admin.site.unregister(User) admin.site.register(Member, MemberAdmin) admin.site.register(Institution, InstitutionAdmin) +admin.site.register(Address) +admin.site.register(Country) diff --git a/dusken/models.py b/dusken/models.py index a4f94fa..3b5509e 100644 --- a/dusken/models.py +++ b/dusken/models.py @@ -2,6 +2,9 @@ import django from django.db import models class Country(models.Model): + class Meta: + verbose_name_plural = "Countries" + def __unicode__(self): return self.name @@ -10,6 +13,10 @@ class Country(models.Model): updated = models.DateTimeField(auto_now=True) class Address(models.Model): + + class Meta: + verbose_name_plural = "Addresses" + def __unicode__(self): return u"{street}, {code} {city}, {country}".format(street=self.street_address, code=self.postal_code, city=self.city, country=self.country) diff --git a/dusken/tests/member.py b/dusken/tests/member.py index e04b7b4..abcde07 100644 --- a/dusken/tests/member.py +++ b/dusken/tests/member.py @@ -165,15 +165,16 @@ class MemberAdressTest(MemberTestBase): def test_member_update_address(self): data = { - "api_client": "v1", "address": { "street" : "somestreet", } } - resp = self.api_client.patch(self.member_url, + response = self.api_client.patch(self.member_url, format='json', data=data) - print resp + self.assertHttpAccepted(response) + print response + print Member.objects.get(username="robert").address