Skip to content
Snippets Groups Projects
Commit b4a811d9 authored by Bodor Máté's avatar Bodor Máté
Browse files

Little changes

parent 0871cd0b
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,8 @@ class ProfileSerializer(serializers.ModelSerializer):
return value
def validate_signed(self, value):
if value is False:
modifier = CurrentUserMiddleware.get_current_user_profile()
if value is False and modifier.role != "Staff":
raise serializers.ValidationError("You cannot join without signed")
return value
......
# Generated by Django 2.0.1 on 2019-01-21 20:24
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('homework', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='solution',
name='accepted',
field=models.BooleanField(default=False),
),
migrations.AlterField(
model_name='solution',
name='corrected',
field=models.BooleanField(default=False),
),
]
......@@ -31,8 +31,8 @@ class Solution(models.Model):
created_at = models.DateTimeField(auto_now_add=True, editable=False)
updated_at = models.DateTimeField(auto_now=True, editable=False)
note = models.TextField(blank=True, default='')
accepted = models.BooleanField()
corrected = models.BooleanField()
accepted = models.BooleanField(blank=True, default=False)
corrected = models.BooleanField(blank=True, default=False)
def __str__(self):
return "[{}] {}".format(self.created_at, self.created_by.full_name)
......@@ -2,8 +2,9 @@ from rest_framework import serializers
from django.utils import timezone
from account.models import Profile
from . import models
from common.email import new_homework
from common import email
from common.middleware import CurrentUserMiddleware
from common.email import homework_corrected
class TaskSerializer(serializers.ModelSerializer):
......@@ -19,7 +20,7 @@ class TaskSerializer(serializers.ModelSerializer):
def create(self, validated_data):
emails = Profile.objects.filter(role="Student").exclude(user__email='').values_list('user__email', flat=True)
new_homework(emails)
email.new_homework(emails)
return self.Meta.model.objects.create(**validated_data)
......
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