From e67c8146bf812a37d15098f8b7d36a8779ccff6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 3 Oct 2013 10:24:34 +0200 Subject: [PATCH] Smallfix: Added some deleted base class --- greenmine/base/api.py | 20 +++++++++++++------- greenmine/projects/api.py | 2 +- greenmine/routers.py | 1 - greenmine/urls.py | 1 - 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/greenmine/base/api.py b/greenmine/base/api.py index f11c0170..22e7d786 100644 --- a/greenmine/base/api.py +++ b/greenmine/base/api.py @@ -1,11 +1,17 @@ # -*- coding: utf-8 -*- -from rest_framework.response import Response -from rest_framework import views +from rest_framework import ( + mixins, + viewsets +) -class ApiRoot(views.APIView): - def get(self, request, **kwargs): - return Response({"name": "Greenmine Api", - "version": 1, - "info": "build with django-rest-framework"}) +class ModelCrudViewSet(mixins.CreateModelMixin, mixins.ListModelMixin, + mixins.RetrieveModelMixin, mixins.UpdateModelMixin, + mixins.DestroyModelMixin, viewsets.GenericViewSet): + pass + + +class ModelListViewSet(mixins.ListModelMixin, mixins.RetrieveModelMixin, + viewsets.GenericViewSet): + pass diff --git a/greenmine/projects/api.py b/greenmine/projects/api.py index cfd044e7..834549a2 100644 --- a/greenmine/projects/api.py +++ b/greenmine/projects/api.py @@ -5,7 +5,7 @@ from django.db.models import Q from rest_framework.permissions import IsAuthenticated from greenmine.base import filters -from greenmine.base.api import ModelCrudViewSet, +from greenmine.base.api import ModelCrudViewSet from greenmine.base.notifications.api import NotificationSenderMixin from . import serializers diff --git a/greenmine/routers.py b/greenmine/routers.py index 0fd781e7..6ebbb760 100644 --- a/greenmine/routers.py +++ b/greenmine/routers.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from greenmine.base import routers -from greenmine.base.api import ApiRoot from greenmine.base.users.api import AuthViewSet, RolesViewSet, UsersViewSet from greenmine.base.searches.api import SearchViewSet from greenmine.projects.api import ProjectViewSet diff --git a/greenmine/urls.py b/greenmine/urls.py index 65242f70..5f46fc33 100644 --- a/greenmine/urls.py +++ b/greenmine/urls.py @@ -10,7 +10,6 @@ from .routers import router admin.autodiscover() urlpatterns = patterns('', - url(r'^api/v1$', ApiRoot.as_view()), url(r'^api/v1/', include(router.urls)), url(r'^admin/', include(admin.site.urls)), url(r'^grappelli/', include('grappelli.urls')),