From 8e2aebcc0943a68daede152b72cf5d01b3b01f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20M=C3=BCllegger?= Date: Sun, 19 May 2013 09:51:09 +0200 Subject: [PATCH] Renaming a few things to make more sense and to stick to conventions. --- djadmin2/apiviews.py | 8 ++++---- djadmin2/models.py | 4 ++-- example/blog/tests/test_apiviews.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/djadmin2/apiviews.py b/djadmin2/apiviews.py index 52df071..d169f40 100644 --- a/djadmin2/apiviews.py +++ b/djadmin2/apiviews.py @@ -2,7 +2,7 @@ from rest_framework import fields, generics, serializers class Admin2APISerializer(serializers.ModelSerializer): - unicode = fields.Field(source='__unicode__') + __str__ = fields.Field(source='__unicode__') class Admin2APIMixin(object): @@ -15,12 +15,12 @@ class Admin2APIMixin(object): model = self.model return ModelAPISerilizer - return super(ModelListCreateAPIView, self).get_serializer_class() + return super(Admin2APIMixin, self).get_serializer_class() -class ModelListCreateAPIView(Admin2APIMixin, generics.ListCreateAPIView): +class ListCreateAPIView(Admin2APIMixin, generics.ListCreateAPIView): pass -class ModelRetrieveUpdateDestroyAPIView(Admin2APIMixin, generics.RetrieveUpdateDestroyAPIView): +class RetrieveUpdateDestroyAPIView(Admin2APIMixin, generics.RetrieveUpdateDestroyAPIView): pass diff --git a/djadmin2/models.py b/djadmin2/models.py index 94c6d3b..0e069c1 100644 --- a/djadmin2/models.py +++ b/djadmin2/models.py @@ -109,8 +109,8 @@ class ModelAdmin2(BaseAdmin2): delete_view = views.ModelDeleteView # API Views - api_index_view = apiviews.ModelListCreateAPIView - api_detail_view = apiviews.ModelRetrieveUpdateDestroyAPIView + api_index_view = apiviews.ListCreateAPIView + api_detail_view = apiviews.RetrieveUpdateDestroyAPIView def __init__(self, model, **kwargs): self.model = model diff --git a/example/blog/tests/test_apiviews.py b/example/blog/tests/test_apiviews.py index c36d238..9e10dc7 100644 --- a/example/blog/tests/test_apiviews.py +++ b/example/blog/tests/test_apiviews.py @@ -14,7 +14,7 @@ class ViewTest(unittest.TestCase): class IndexViewModelListCreateAPIViewTest(ViewTest): def test_response_ok(self): request = self.factory.get('/admin/api/blog/post/') - response = apiviews.ModelListCreateAPIView.as_view(model=Post)(request) + response = apiviews.ListCreateAPIView.as_view(model=Post)(request) self.assertEqual(response.status_code, 200) def test_list_includes_unicode_field(self):