numerous updates

This commit is contained in:
Ross
2022-05-20 20:26:02 +01:00
parent 0373b22e78
commit 77ccdbc92a
246 changed files with 22615 additions and 2409 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ class QuestionAdmin(VersionAdmin):
#)
class CidUserInline(admin.TabularInline):
model = Exam.valid_users.through
model = Exam.valid_cid_users.through
extra = 1
class ExamAdmin(VersionAdmin, admin.ModelAdmin):
@@ -0,0 +1,18 @@
# Generated by Django 3.2.13 on 2022-05-20 10:45
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('physics', '0019_exam_authors_only'),
]
operations = [
migrations.RenameField(
model_name='exam',
old_name='valid_users',
new_name='valid_cid_users',
),
]
@@ -0,0 +1,20 @@
# Generated by Django 3.2.13 on 2022-05-20 12:42
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('physics', '0020_rename_valid_users_exam_valid_cid_users'),
]
operations = [
migrations.AddField(
model_name='exam',
name='valid_user_users',
field=models.ManyToManyField(blank=True, related_name='user_physics_exams', to=settings.AUTH_USER_MODEL),
),
]
+5 -1
View File
@@ -152,10 +152,14 @@ class Exam(ExamBase):
related_name="physics_exam_author",
)
valid_users = models.ManyToManyField(
valid_cid_users = models.ManyToManyField(
CidUser, blank=True, related_name="physics_exams"
)
valid_user_users = models.ManyToManyField(
settings.AUTH_USER_MODEL, blank=True, related_name="user_physics_exams"
)
def get_take_url(self):
return reverse("physics:exam_start", kwargs={"pk": self.pk})