From d6043d72e95818fd983f88d62bab9adf1832fc5c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 15 Jul 2015 10:26:56 +0200 Subject: [PATCH] update quota optional fields --- teleforma/exam/admin.py | 7 ------- teleforma/exam/models.py | 9 ++++----- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/teleforma/exam/admin.py b/teleforma/exam/admin.py index 18d4c900..d4f36a58 100644 --- a/teleforma/exam/admin.py +++ b/teleforma/exam/admin.py @@ -5,15 +5,8 @@ from django.contrib import admin from django.contrib.auth.models import User from django.contrib.auth.admin import UserAdmin -class QuotaAdminForm(forms.ModelForm): - corrector = forms.ModelChoiceField(queryset=User.objects.order_by('last_name')) - class Meta: - model = Quota - - class QuotaAdmin(admin.ModelAdmin): model= Quota - form = QuotaAdminForm list_display = ['corrector_name', 'course', 'script_type', 'date_start', 'date_end', 'pending_script_count', 'marked_script_count', 'all_script_count', 'value', 'level'] diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index d87be17e..2583bb11 100644 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -118,14 +118,13 @@ def check_unique_mimetype(l): class Quota(models.Model): - course = models.ForeignKey(Course, related_name="quotas", verbose_name=_('course'), blank=True, null=True) - corrector = models.ForeignKey(User, related_name="quotas", verbose_name=_('corrector'), blank=True, null=True) - period = models.ForeignKey(Period, related_name='quotas', verbose_name=_('period'), - null=True, blank=True, on_delete=models.SET_NULL) + course = models.ForeignKey(Course, related_name="quotas", verbose_name=_('course')) + corrector = models.ForeignKey(User, related_name="quotas", verbose_name=_('corrector')) + period = models.ForeignKey(Period, related_name='quotas', verbose_name=_('period'), null=True, blank=True, on_delete=models.SET_NULL) value = models.IntegerField(_('value')) date_start = models.DateField(_('date start')) date_end = models.DateField(_('date end')) - script_type = models.ForeignKey('ScriptType', related_name='quotas', verbose_name=_('type'), null=True, on_delete=models.SET_NULL) + script_type = models.ForeignKey('ScriptType', related_name='quotas', verbose_name=_('type'), null=True, blank=True, on_delete=models.SET_NULL) class Meta(MetaCore): verbose_name = _('Quota') -- 2.39.5