From 323eed5beecf9fe397a96a72fed1826610000708 Mon Sep 17 00:00:00 2001 From: Mark Polak Date: Wed, 21 Aug 2013 21:22:07 +0200 Subject: [PATCH] Adds models to admin and adds plural name to models --- dusken/admin.py | 4 +++- dusken/models.py | 6 ++++++ dusken/tests/member.py | 7 ++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dusken/admin.py b/dusken/admin.py index 81defcd..21983d9 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): fieldsets = [ @@ -20,3 +20,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 21b6fb9..7e80e26 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,9 @@ class Country(models.Model): updated = models.DateTimeField(auto_now=True) class Address(models.Model): + class Meta: + verbose_name_plural = "Addresses" + street_address = models.CharField(max_length=255) city = models.CharField(max_length=100) country = models.ForeignKey(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