Skip to content
Snippets Groups Projects
Commit d2ddef23 authored by Chif Gergo's avatar Chif Gergo
Browse files

settings in new files and validation

parent d83c8a05
No related branches found
No related tags found
No related merge requests found
from django.contrib import admin
from . import models
from solo.admin import SingletonModelAdmin
@admin.register(models.Profile)
......@@ -14,3 +15,4 @@ class ProfileAdmin(admin.ModelAdmin):
# Register your models here.
admin.site.register(models.GroupChoice)
admin.site.register(models.Deadline, SingletonModelAdmin)
# -*- coding: utf-8 -*-
# Generated by Django 1.11.5 on 2018-01-25 18:42
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('account', '0010_auto_20180124_1929'),
]
operations = [
migrations.CreateModel(
name='Deadline',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('deadline', models.DateField()),
],
options={
'abstract': False,
},
),
]
# -*- coding: utf-8 -*-
# Generated by Django 1.11.5 on 2018-01-25 18:57
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('account', '0011_deadline'),
]
operations = [
migrations.AlterField(
model_name='deadline',
name='deadline',
field=models.DateField(null=True),
),
]
from django.db import models
from django.contrib.auth.models import User
from solo.models import SingletonModel
class GroupChoice(models.Model):
......@@ -28,3 +29,7 @@ class Profile(models.Model):
def __str__(self):
return self.user.username
class Deadline(SingletonModel):
deadline = models.DateField(null=True)
......@@ -14,3 +14,8 @@ class ProfileSerializer(serializers.ModelSerializer):
class Meta:
model = models.Profile
fields = ('id', 'join_date', 'user', 'nick', 'motivation', 'signed', 'groups')
def validate(self, data):
if data['join_date'] > models.Deadline.get_solo().deadline:
raise serializers.ValidationError("join_date more than deadline")
return data
......@@ -40,6 +40,7 @@ INSTALLED_APPS = [
'django_extensions',
'rest_framework',
'social_django',
'solo',
'authsch',
'homework',
'account',
......
from .base import *
from .base import *
DEBUG = True
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': os.getenv('DB_NAME', 'kszkepzes'),
'USER': os.getenv('DB_USER'),
'PASSWORD': os.getenv('DB_PASSWORD'),
'HOST': os.getenv('DB_HOST', 'localhost'),
'PORT': os.getenv('DB_PORT', 5432),
}
}
......@@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kszkepzes.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kszkepzes.settings.production")
application = get_wsgi_application()
......@@ -3,7 +3,7 @@ import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kszkepzes.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kszkepzes.settings.local")
try:
from django.core.management import execute_from_command_line
except ImportError:
......
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