src/contacts/tests.py @@ -1,5 +1,5 @@ [buildout] -parts = python django +parts = python django django-trunk develop = . eggs = django-contacts @@ -15,4 +15,13 @@ project = contacts projectegg = contacts settings = testsettings test = contacts +eggs = ${buildout:eggs} + +[django-trunk] +recipe = djangorecipe +version = trunk +project = ${django:project} +projectegg = ${django:project} +settings = ${django:settings} +test = ${django:test} eggs = ${buildout:eggs} \ No newline at end of file buildout.cfg @@ -11,6 +11,17 @@ } }, { + "pk": 2, + "model": "contacts.company", + "fields": { + "name": "Braithwaite Technology Consultants Inc.", + "slug": "btci", + "nickname": "BTCI", + "date_modified": "2009-05-29 00:34:06", + "date_added": "2009-05-29 00:34:06" + } + }, + { "pk": 1, "model": "contacts.person", "fields": { @@ -22,5 +33,18 @@ "date_modified": "2009-05-28 21:28:34", "date_added": "2009-05-28 21:28:34" } + }, + { + "pk": 2, + "model": "contacts.person", + "fields": { + "first_name": "Bruce", + "last_name": "Braithwaite", + "slug": "bruce-braithwaite", + "title": "President and CEO", + "company": 2, + "date_modified": "2009-05-29 00:56:06", + "date_added": "2009-05-29 00:56:06" + } } ] \ No newline at end of file src/contacts/fixtures/contacts.json @@ -20,7 +20,7 @@ class Company(models.Model): instant_messenger = GenericRelation('InstantMessenger') web_site = GenericRelation('WebSite') street_address = GenericRelation('StreetAddress') - note = GenericRelation(Comment) + note = GenericRelation(Comment, object_id_field='object_pk') date_added = models.DateTimeField(_('date added'), auto_now_add=True) date_modified = models.DateTimeField(_('date modified'), auto_now=True) src/contacts/models.py 6fced4a60f1db02f0988d591c78796a36f9b9976 Myles Braithwaite me@mylesbraithwaite.com http://github.com/myles/django-contacts/commit/e542deb6694abbc774132ad63b972d72033ec442 e542deb6694abbc774132ad63b972d72033ec442 2009-05-28T23:01:18-07:00 2009-05-28T23:01:18-07:00 Did some work on the testing. 14daba1d964fed0e0c3a392cba4c26ea6775b147 Myles Braithwaite me@mylesbraithwaite.com