diff --git a/server/proj/conf/urls.py b/server/proj/conf/urls.py index 1cc7d55..7669fc8 100644 --- a/server/proj/conf/urls.py +++ b/server/proj/conf/urls.py @@ -13,11 +13,13 @@ from news import views as newsViews from rest_framework import routers, serializers, viewsets from userProfile.views import ProfileViewSet from django.conf import settings +from rubricks.views import RubricViewSet router = routers.DefaultRouter() router.register(r'news', newsViews.NewsViewSet) router.register(r'profiles', ProfileViewSet, basename='profiles') +router.register(r'rubriks', RubricViewSet, basename='rubriks') urlpatterns = [ path('api/admin/', admin.site.urls), diff --git a/server/proj/rubricks/admin.py b/server/proj/rubricks/admin.py index 4434ac2..1644e34 100644 --- a/server/proj/rubricks/admin.py +++ b/server/proj/rubricks/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin from .models import Rubric +@admin.site.register(Rubric) class RubricAdmin(admin.ModelAdmin): list_display = ('name', 'description') -admin.site.register(Rubric, RubricAdmin) \ No newline at end of file diff --git a/server/proj/rubricks/models.py b/server/proj/rubricks/models.py index 87fd90f..d4fb0dd 100644 --- a/server/proj/rubricks/models.py +++ b/server/proj/rubricks/models.py @@ -4,3 +4,10 @@ from django.db import models class Rubric(models.Model): name = models.CharField(max_length=255) description = models.TextField() + + def __str__(self): + return str(self.name) + + class Meta: + verbose_name = 'Рубрики' + verbose_name_plural = 'Рубрики' diff --git a/server/proj/rubricks/serializers.py b/server/proj/rubricks/serializers.py index 575f24d..627550e 100644 --- a/server/proj/rubricks/serializers.py +++ b/server/proj/rubricks/serializers.py @@ -4,4 +4,4 @@ from .models import Rubric class RubricSerializer(serializers.ModelSerializer): class Meta: model = Rubric - fields = ['id', 'name', 'description', 'time'] + fields = ('id', 'name', 'description') diff --git a/server/proj/rubricks/views.py b/server/proj/rubricks/views.py index e4c483d..e807b86 100644 --- a/server/proj/rubricks/views.py +++ b/server/proj/rubricks/views.py @@ -1,7 +1,13 @@ -from rest_framework import viewsets +from rest_framework.viewsets import ViewSet from .models import Rubric from .serializers import RubricSerializer +from rest_framework.response import Response +from rest_framework import status + +class RubricViewSet(ViewSet): + def list(self, request): + queryset = Rubric.objects.all() + serializer = RubricSerializer(queryset, many=True) + return Response(serializer.data, status=status.HTTP_200_OK) + -class RubricViewSet(viewsets.ModelViewSet): - queryset = Rubric.objects.all() - serializer_class = RubricSerializer