Fixed changing active semester

advlabdb/routes.py

@@ -1,4 +1,4 @@
-from flask import redirect, render_template, request, url_for
+from flask import redirect, render_template, request, url_for, flash
 from flask_security import auth_required, current_user
 
 from advlabdb import app
@@ -73,7 +73,12 @@ def index():
 @app.route("/set_semester")
 @auth_required()
 def set_semester():
-    setUserActiveSemester(request.args.get("semester_id"))
-    ref = request.referrer
-    red = ref if ref else url_for("index")
+    try:
+        semesterId = int(request.args.get("semester_id"))
+    except Exception as ex:
+        flash(str(ex), "error")
+    else:
+        setUserActiveSemester(semesterId)
+
+    red = request.referrer or url_for("index")
     return redirect(red)

advlabdb/utils.py

@@ -102,11 +102,16 @@ def partFromLabelInUserActiveSemester(partLabel):
 
 
 def setUserActiveSemester(semesterId):
-    try:
-        current_user.active_semester_id = Semester.query.get(int(semesterId)).id
-    except Exception as err:
-        flash(str(err))
-        return False
-    db.session.commit()
-    flash(f"Active semester changed to {Semester.query.get(semesterId).label}!", "warning")
-    return True
+    if current_user.active_semester_id != semesterId:
+        if Semester.query.get(semesterId):
+            try:
+                current_user.active_semester_id = semesterId
+                db.session.commit()
+            except Exception as ex:
+                flash(str(ex), "error")
+
+                db.session.rollback()
+            else:
+                flash(f"Active semester changed to {Semester.query.get(semesterId).label}!", "warning")
+        else:
+            flash(f"No semester with ID {semesterId}!", "error")