From 68310dc4caabf1d33d8f55e06ada76efb0f82318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodor=20M=C3=A1t=C3=A9?= <bodor.mate@kszk.bme.hu>
Date: Tue, 29 Jan 2019 14:36:25 +0100
Subject: [PATCH] little changes
---
src/document/models.py | 3 ++-
src/document/serializers.py | 2 +-
src/document/views.py | 3 ++-
src/kszkepzes/settings/production.py | 2 --
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/document/models.py b/src/document/models.py
index 0c25cf0..a9d72a2 100644
--- a/src/document/models.py
+++ b/src/document/models.py
@@ -9,7 +9,7 @@ from common.validators import FileSizeValidator
class Document(models.Model):
uploaded_by = models.ForeignKey(Profile, on_delete=models.DO_NOTHING)
uploaded_at = models.DateTimeField(auto_now_add=True, editable=False)
- name = models.CharField(max_length=150)
+ name = models.CharField(max_length=150, blank=True, default='')
description = models.TextField(blank=True, default='')
file = models.FileField(
validators=[
@@ -22,6 +22,7 @@ class Document(models.Model):
FileSizeValidator(size_limit=52428800), # 52428800 - 50MiB
],
blank=True,
+ null=True
)
solution = models.ForeignKey(Solution, related_name='files', on_delete=models.CASCADE)
diff --git a/src/document/serializers.py b/src/document/serializers.py
index d079d10..f7ad1c3 100644
--- a/src/document/serializers.py
+++ b/src/document/serializers.py
@@ -3,7 +3,7 @@ from common.serializers import CurrentUserProfileDefault
from . import models
from common.middleware import CurrentUserMiddleware
-_max_count = 5
+_max_count = 1
class DocumentSerializer(serializers.ModelSerializer):
diff --git a/src/document/views.py b/src/document/views.py
index 4a81459..00f5321 100644
--- a/src/document/views.py
+++ b/src/document/views.py
@@ -1,13 +1,14 @@
from rest_framework import viewsets
-
from common import permissions
from . import models
from . import serializers
+from rest_framework.parsers import JSONParser, MultiPartParser
class DocumentViewSet(viewsets.ModelViewSet):
serializer_class = serializers.DocumentSerializer
permission_classes = (permissions.IsStaffOrStudent, )
+ parser_classes = (JSONParser, MultiPartParser)
def get_queryset(self):
user = self.request.user
diff --git a/src/kszkepzes/settings/production.py b/src/kszkepzes/settings/production.py
index 24575d5..cbd8659 100644
--- a/src/kszkepzes/settings/production.py
+++ b/src/kszkepzes/settings/production.py
@@ -15,7 +15,6 @@ DATABASES = {
}
}
-
REST_FRAMEWORK = {
'DEFAULT_RENDERER_CLASSES': (
'rest_framework.renderers.JSONRenderer',
@@ -26,7 +25,6 @@ REST_FRAMEWORK = {
}
STATIC_ROOT = os.path.join(BASE_DIR, 'static_collected')
-
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = 'mail.sch.bme.hu'
EMAIL_PORT = 25
--
GitLab