update quota optional fields

diff --git a/teleforma/exam/admin.py b/teleforma/exam/admin.py
index 18d4c9001d9b742b198aa1e7ec52aee1084d966c..d4f36a58824444f92d2ed9890ea94d1b3237d265 100644 (file)
--- 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 d87be17eb4edbbf428d58981317a180ba340714c..2583bb11a370dd9093befe52014c90574faa9042 100644 (file)
--- 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')