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

Apply C4

Browse source
This commit is contained in:
Mo 2023-11-02 19:01:07 +01:00
parent 45258fa4c6
commit d408e8fc08
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
advlabdb/adminModelViews.py
View file

@ -112,7 +112,7 @@ def semesterExperimentQueryFactory():
class SemesterRowFilter(FilterEqual): class SemesterRowFilter(FilterEqual):
def get_options(self, view): def get_options(self, view):
if not has_request_context(): if not has_request_context():
return tuple() return ()
semesters = Semester.sortedSemestersStartingWithNewest() semesters = Semester.sortedSemestersStartingWithNewest()
return tuple((semester.id, str(semester)) for semester in semesters) return tuple((semester.id, str(semester)) for semester in semesters)
@ -542,7 +542,7 @@ def groupQueryFactory():
class PartRowFilter(FilterEqual): class PartRowFilter(FilterEqual):
def get_options(self, view): def get_options(self, view):
if not has_request_context(): if not has_request_context():
return tuple() return ()
parts = db.session.scalars(select(Part).where(Part.semester == current_user.active_semester)) parts = db.session.scalars(select(Part).where(Part.semester == current_user.active_semester))
return tuple((part.id, part.str_without_semester()) for part in parts) return tuple((part.id, part.str_without_semester()) for part in parts)
@ -620,7 +620,7 @@ def partStudentQueryFactory():
class ProgramRowFilter(FilterEqual): class ProgramRowFilter(FilterEqual):
def get_options(self, view): def get_options(self, view):
if not has_request_context(): if not has_request_context():
return tuple() return ()
programs = db.session.scalars(select(Program)) programs = db.session.scalars(select(Program))
return tuple((program.id, str(program)) for program in programs) return tuple((program.id, str(program)) for program in programs)
@ -934,7 +934,7 @@ class AdminView(SecureAdminModelView):
class ExperimentRowFilter(FilterEqual): class ExperimentRowFilter(FilterEqual):
def get_options(self, view): def get_options(self, view):
if not has_request_context(): if not has_request_context():
return tuple() return ()
activeExperiments = db.session.scalars(select(Experiment).where(Experiment.active is True)) activeExperiments = db.session.scalars(select(Experiment).where(Experiment.active is True))
return tuple( return tuple(
@ -1098,7 +1098,7 @@ def groupExperimentQueryFactory():
class AssistantRowFilter(FilterEqual): class AssistantRowFilter(FilterEqual):
def get_options(self, view): def get_options(self, view):
if not has_request_context(): if not has_request_context():
return tuple() return ()
activeAssistants = assistantQueryFactory() activeAssistants = assistantQueryFactory()
return tuple((assistant.id, str(assistant)) for assistant in activeAssistants) return tuple((assistant.id, str(assistant)) for assistant in activeAssistants)
@ -1191,7 +1191,7 @@ class ExperimentMarkView(SecureAdminModelView):
class AdminFilter(FilterEqual): class AdminFilter(FilterEqual):
def get_options(self, view): def get_options(self, view):
if not has_request_context(): if not has_request_context():
return tuple() return ()
admins = db.session.scalars(select(Admin).join(User).where(User.active is True)) admins = db.session.scalars(select(Admin).join(User).where(User.active is True))
return tuple((admin.id, str(admin)) for admin in admins) return tuple((admin.id, str(admin)) for admin in admins)

4
advlabdb/routes.py
View file

@ -14,12 +14,12 @@ def util_processor():
footer = f"AdvLabDB - <a href={repo_url} target='_blank' rel='noopener noreferrer'>Source code</a>" footer = f"AdvLabDB - <a href={repo_url} target='_blank' rel='noopener noreferrer'>Source code</a>"
return dict(active_semester_str=active_semester_str, current_user=current_user, footer=footer) return {"active_semester_str": active_semester_str, "current_user": current_user, "footer": footer}
@security.login_context_processor @security.login_context_processor
def login_context_processor(): def login_context_processor():
return dict(message=settings.get("login_view_message")) return {"message": settings.get("login_view_message")}
@bp.route("/") @bp.route("/")

2
pyproject.toml
View file

@ -27,7 +27,7 @@ requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api" build-backend = "poetry.core.masonry.api"
[tool.ruff] [tool.ruff]
select = ["E1", "E4", "E7", "E9", "W", "F", "I", "UP", "YTT", "S1", "S5", "S7", "B"] select = ["E1", "E4", "E7", "E9", "W", "F", "I", "UP", "YTT", "S1", "S5", "S7", "B", "C4"]
line-length = 120 line-length = 120
[tool.ruff.per-file-ignores] [tool.ruff.per-file-ignores]