From f574f67dbad746b63615cfe8ee5fe110a0b4b116 Mon Sep 17 00:00:00 2001 From: crunk Date: Mon, 28 Mar 2022 18:48:31 +0200 Subject: [PATCH] turn users as tutors on or off --- verse/adminpage.py | 14 ++++++++------ verse/forms/adminuserform.py | 4 +++- verse/statuspengguna/resetpassword.py | 2 +- verse/templates/admin.html | 3 +++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/verse/adminpage.py b/verse/adminpage.py index 414ac2a..e2839b8 100644 --- a/verse/adminpage.py +++ b/verse/adminpage.py @@ -28,7 +28,9 @@ def AdminPage(): if adminuserform.delete.data: DeleteUsers(adminuserform) if adminuserform.tutors.data: - MakeUsersTutors(adminuserform) + ToggleUsersAsTutors(adminuserform, True) + if adminuserform.nottutors.data: + ToggleUsersAsTutors(adminuserform, False) template = render_template( "admin.html", @@ -49,19 +51,19 @@ def DeleteUsers(adminuserform): userform.errors.append(f"User {useremail} deleted!") -def MakeUsersTutors(adminuserform): +def ToggleUsersAsTutors(adminuserform, is_tutor): for userform in adminuserform: if "user" in userform.id: if userform.data: useremail = userform.label.text user = User.query.filter_by(email=useremail).first() - MakeUserTutorinDb(user) - userform.errors.append(f"User {useremail} is now a tutor!") + ToggleUserTutorinDb(user, is_tutor) + userform.errors.append(f"Is User {useremail} tutor {is_tutor}") -def MakeUserTutorinDb(user): +def ToggleUserTutorinDb(user, is_tutor): try: - user.tutor = True + user.tutor = is_tutor db.session.commit() except (InvalidRequestError, DataError, InterfaceError, DatabaseError): db.session.rollback() diff --git a/verse/forms/adminuserform.py b/verse/forms/adminuserform.py index b7f1355..3d7ae22 100644 --- a/verse/forms/adminuserform.py +++ b/verse/forms/adminuserform.py @@ -22,6 +22,8 @@ class AdminUserForm(FlaskForm): return UserListForm() - tutors = SubmitField("Are Tutors") + tutors = SubmitField("Are tutors") + + nottutors = SubmitField("Are not tutors") delete = SubmitField("Delete") diff --git a/verse/statuspengguna/resetpassword.py b/verse/statuspengguna/resetpassword.py index dc2a977..b802dab 100644 --- a/verse/statuspengguna/resetpassword.py +++ b/verse/statuspengguna/resetpassword.py @@ -20,7 +20,7 @@ from flask_bcrypt import generate_password_hash from app import db -def ResetPassword(path): +def ResetPassword(path): linkvalid = False user = User.query.filter_by(resethash=path).first() if user is None: diff --git a/verse/templates/admin.html b/verse/templates/admin.html index 39009ec..c1fe24a 100644 --- a/verse/templates/admin.html +++ b/verse/templates/admin.html @@ -56,6 +56,9 @@
{{ adminuserform.tutors }}
+
+ {{ adminuserform.nottutors }} +
{{ adminuserform.delete }}