Skip to content
Snippets Groups Projects
Commit d6fdc0e7 authored by Barnabás Czémán's avatar Barnabás Czémán
Browse files

Modify homework models & fix some settings

parent 5aac9233
No related branches found
No related tags found
No related merge requests found
...@@ -10,18 +10,19 @@ class TaskSerializer(serializers.ModelSerializer): ...@@ -10,18 +10,19 @@ class TaskSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = models.Task model = models.Task
read_only_fields = ('created_by', 'date') read_only_fields = ('created_by', 'created_at', 'updated_at')
fields = '__all__' fields = '__all__'
class SolutionSerializer(serializers.ModelSerializer): class SolutionSerializer(serializers.ModelSerializer):
date = serializers.DateTimeField(read_only=True) created_at = serializers.DateTimeField(read_only=True)
updated_at = serializers.DateTimeField(read_only=True)
created_by = serializers.HiddenField(default=CurrentUserProfileDefault()) created_by = serializers.HiddenField(default=CurrentUserProfileDefault())
class Meta: class Meta:
model = models.Solution model = models.Solution
read_only_fields = ('created_by', 'date' 'ready') read_only_fields = ('created_by', 'created_at', 'updated_at', 'ready')
fields = ('task', 'date', 'accepted', 'files', 'created_by') fields = ('task', 'created_at', 'updated_at', 'accepted', 'files', 'created_by')
def validate(self, data): def validate(self, data):
if timezone.now() > data['task'].deadline: if timezone.now() > data['task'].deadline:
......
...@@ -153,3 +153,6 @@ USE_TZ = True ...@@ -153,3 +153,6 @@ USE_TZ = True
# https://docs.djangoproject.com/en/1.11/howto/static-files/ # https://docs.djangoproject.com/en/1.11/howto/static-files/
STATIC_URL = '/django-static/' STATIC_URL = '/django-static/'
MEDIA_ROOT = os.getenv('MEDIA_ROOT', '/tmp')
MEDIA_URL = '/media/'
from django.conf.urls import url, include from django.conf.urls import url, include
from django.conf.urls.static import static
from django.conf import settings
from django.contrib import admin from django.contrib import admin
from django.contrib.auth import views as auth_views from django.contrib.auth import views as auth_views
...@@ -9,6 +11,8 @@ urlpatterns = [ ...@@ -9,6 +11,8 @@ urlpatterns = [
url(r'^api/v1/', include('stats.urls')), url(r'^api/v1/', include('stats.urls')),
url(r'^api/v1/', include('account.urls')), url(r'^api/v1/', include('account.urls')),
url(r'^api/v1/', include('news.urls')), url(r'^api/v1/', include('news.urls')),
url(r'^api/v1/logout/$', auth_views.LogoutView.as_view(), name='logout'), url(r'^api/v1/logout/$', auth_views.LogoutView.as_view(), name='logout'),
] ]
if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment