diff --git a/django_kepi/models.py b/django_kepi/models.py index 790deb5..d1fadc6 100644 --- a/django_kepi/models.py +++ b/django_kepi/models.py @@ -17,7 +17,7 @@ class Cobject(models.Model): published = models.DateTimeField(default=datetime.datetime.now) updated = models.DateTimeField(default=datetime.datetime.now) - def activity_fields(self): + def serialize(self): result = { 'id': self.pk, diff --git a/django_kepi/views.py b/django_kepi/views.py index 466ce5d..d1e6b50 100644 --- a/django_kepi/views.py +++ b/django_kepi/views.py @@ -26,6 +26,6 @@ class ActivityObjectView(django.views.View): #instance = ActivityObject.objects.get(pk=kwargs['id']) instance = None # XXX temp - result = instance.activity_fields() + result = instance.serialize() return render(result) diff --git a/tests/tests_unit.py b/tests/tests_unit.py index 868c52b..4ccfafe 100644 --- a/tests/tests_unit.py +++ b/tests/tests_unit.py @@ -18,4 +18,4 @@ class UserTests(TestCase): ) activity.save() - raise ValueError(str(activity.activity_fields())) + raise ValueError(str(activity.serialize())) diff --git a/things_for_testing/models.py b/things_for_testing/models.py index d8f354c..dfc6317 100644 --- a/things_for_testing/models.py +++ b/things_for_testing/models.py @@ -9,10 +9,8 @@ class ThingUser(models.Model): # on_delete=models.CASCADE, # ) - def activity_fields(self): + def serialize(self): return { 'name': self.name, } -register_type('Person', ThingUser) -