mo8it/AdvLabDB
1
0
Fork 0
mirror of https://codeberg.org/Mo8it/AdvLabDB.git synced 2024-09-19 18:31:16 +00:00
Code Releases Activity

Require active_semester

Browse source
This commit is contained in:
Mo 2022-05-17 01:11:47 +02:00
parent e71d711090
commit 2236edb8aa
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
advlabdb/adminModelViews.py
View file

@ -148,8 +148,7 @@ class UserView(SecureAdminModelView):
active_semester = QuerySelectField( active_semester = QuerySelectField(
"Active Semester", "Active Semester",
query_factory=semesterQueryFactory, query_factory=semesterQueryFactory,
allow_blank=True, validators=[DataRequired()],
blank_text="-",
default=lastSemester, default=lastSemester,
description="Not fixed and users (including assistants) can change it.", description="Not fixed and users (including assistants) can change it.",
) )

1
advlabdb/scripts/setup/init_database.py
View file

@ -69,6 +69,7 @@ def main():
mobile_phone_number=admin_mobile_phone_number.strip() or None, mobile_phone_number=admin_mobile_phone_number.strip() or None,
building=admin_building.strip() or None, building=admin_building.strip() or None,
room=admin_room.strip() or None, room=admin_room.strip() or None,
active_semester=semester,
) )
admin = Admin(user=admin_user) admin = Admin(user=admin_user)

3
advlabdb/scripts/test/test_database.py
View file

@ -107,6 +107,7 @@ def main():
roles=[adminRole], roles=[adminRole],
first_name="Peter", first_name="Peter",
last_name="Blümler", last_name="Blümler",
active_semester=sem2,
) )
admin = Admin(user=admin_user) admin = Admin(user=admin_user)
@ -121,6 +122,7 @@ def main():
last_name="l", last_name="l",
phone_number="012333212", phone_number="012333212",
mobile_phone_number="012334123", mobile_phone_number="012334123",
active_semester=sem2,
) )
us2 = user_datastore.create_user( us2 = user_datastore.create_user(
email="test2@protonmail.com", email="test2@protonmail.com",
@ -128,6 +130,7 @@ def main():
roles=[assistantRole], roles=[assistantRole],
first_name="As2", first_name="As2",
last_name="l", last_name="l",
active_semester=sem2,
) )
as1 = Assistant(user=us1) as1 = Assistant(user=us1)