Ограничение на журналы (тем, уроков, курсов)

feature/fix_generate_pass
Andrey 8 years ago
parent 105acc37ce
commit 7bf00bdc0e
  1. 20
      access/migrations/0006_auto_20171220_1228.py
  2. 2
      access/models/other.py
  3. 2
      csv/load_perm.py

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2017-12-20 12:28
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('access', '0005_auto_20171218_1516'),
]
operations = [
migrations.AlterField(
model_name='progress',
name='route',
field=models.CharField(blank=True, max_length=15, null=True, verbose_name='Токен прохождения'),
),
]

@ -47,7 +47,7 @@ class Progress(models.Model):
teacher = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name="Преподователь по умолчанию",
related_name='teacher_progress')
user = models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='Студент')
route = models.CharField(max_length=15, verbose_name='Токен прохождения')
route = models.CharField(max_length=15, verbose_name='Токен прохождения', blank=True, null=True)
def __str__(self):
return '%s' % (self.user.email,)

@ -34,13 +34,11 @@ if __name__ == '__main__':
try:
p = Progress.objects.get(
user=user,
route=route,
teacher=get_user_model().objects.get(id=row['teacher']),
)
except Progress.DoesNotExist:
p = Progress.objects.create(
user=user,
route=route,
teacher=get_user_model().objects.get(id=row['teacher']),
)

Loading…
Cancel
Save