From 6fb4b661350a41ee04c32651f25b74df5f61d426 Mon Sep 17 00:00:00 2001 From: rlacko <rlacko@sch.bme.hu> Date: Sat, 8 Feb 2020 04:04:26 +0100 Subject: [PATCH] fixed image site --- src/images/admin.py | 4 ++-- .../migrations/0003_auto_20200208_0402.py | 17 +++++++++++++++++ src/images/models.py | 2 +- src/images/serializers.py | 8 ++++---- src/images/views.py | 16 ++++++---------- 5 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 src/images/migrations/0003_auto_20200208_0402.py diff --git a/src/images/admin.py b/src/images/admin.py index e545953..01981f7 100644 --- a/src/images/admin.py +++ b/src/images/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import Images +from .models import Image -admin.site.register(Images) +admin.site.register(Image) # Register your models here. diff --git a/src/images/migrations/0003_auto_20200208_0402.py b/src/images/migrations/0003_auto_20200208_0402.py new file mode 100644 index 0000000..4868a49 --- /dev/null +++ b/src/images/migrations/0003_auto_20200208_0402.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.4 on 2020-02-08 03:02 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('images', '0002_auto_20200208_0254'), + ] + + operations = [ + migrations.RenameModel( + old_name='Images', + new_name='Image', + ), + ] diff --git a/src/images/models.py b/src/images/models.py index bd1d716..b1f898e 100644 --- a/src/images/models.py +++ b/src/images/models.py @@ -1,7 +1,7 @@ from django.db import models -class Images(models.Model): +class Image(models.Model): image = models.ImageField( upload_to='public/images/', null=True, blank=True ) diff --git a/src/images/serializers.py b/src/images/serializers.py index e8985bd..5105fd0 100644 --- a/src/images/serializers.py +++ b/src/images/serializers.py @@ -1,9 +1,9 @@ -from images.models import Images +from images.models import Image from rest_framework import serializers -class ImagesSerializer(serializers.ModelSerializer): +class ImageSerializer(serializers.ModelSerializer): class Meta: - model = Images - fields = ('id', 'image') + model = Image + fields = ('image',) diff --git a/src/images/views.py b/src/images/views.py index 162a8da..097e757 100644 --- a/src/images/views.py +++ b/src/images/views.py @@ -1,14 +1,10 @@ -from common.permissions import IsStaffOrStudent, \ - IsStaffOrReadOnlyForAuthenticated +from common.permissions import IsStaffOrReadOnly from rest_framework import viewsets -from images.models import Images -from images.serializers import ImagesSerializer +from images.models import Image +from images.serializers import ImageSerializer class ImagesViewSet(viewsets.ModelViewSet): - serializer_class = ImagesSerializer - permission_classes = ( - IsStaffOrReadOnlyForAuthenticated, - IsStaffOrStudent, - ) - queryset = Images.objects.all() + serializer_class = ImageSerializer + permission_classes = (IsStaffOrReadOnly, ) + queryset = Image.objects.all() -- GitLab