diff --git a/app/controllers/main_routes/laborHistory.py b/app/controllers/main_routes/laborHistory.py index 021fb2e1..e4878041 100755 --- a/app/controllers/main_routes/laborHistory.py +++ b/app/controllers/main_routes/laborHistory.py @@ -30,7 +30,7 @@ def laborhistory(id, departmentName = None): try: currentUser = require_login() - if not currentUser: # Not logged in + if not currentUser: return render_template('errors/403.html'), 403 student = getOrCreateStudentRecord(bnumber=id) studentForms = FormHistory.select().join_from(FormHistory, LaborStatusForm).join_from(FormHistory, HistoryType).where(FormHistory.formID.studentSupervisee == student, diff --git a/app/controllers/main_routes/studentOverloadApp.py b/app/controllers/main_routes/studentOverloadApp.py index cb44e7a3..b2a86d72 100755 --- a/app/controllers/main_routes/studentOverloadApp.py +++ b/app/controllers/main_routes/studentOverloadApp.py @@ -25,7 +25,6 @@ def studentOverloadApp(formHistoryId): return render_template('errors/403.html'), 403 if currentUser.student.ID != overloadForm.formID.studentSupervisee.ID: return render_template('errors/403.html'), 403 - lsfForm = (LaborStatusForm.select(LaborStatusForm, Student, Term, Department) .join(Student, attr="studentSupervisee").switch() .join(Term).switch() @@ -144,7 +143,6 @@ def updateDatabase(overloadFormHistoryID): overloadFormHistory.save() originalFormHistory.status = newStatus originalFormHistory.save() - overloadForm = overloadFormHistory.overloadForm overloadForm.studentOverloadReason = overloadReason overloadForm.save() @@ -152,8 +150,8 @@ def updateDatabase(overloadFormHistoryID): email = emailHandler(overloadFormHistory.formHistoryID) link = makeThirdPartyLink("Financial Aid", request.host, overloadFormHistory.formHistoryID) email.overloadVerification("Financial Aid", link) - - return "" + currentUser = require_login() + return (currentUser.student.ID) except Exception as e: print("ERROR: " + str(e)) diff --git a/app/static/js/studentOverloadApp.js b/app/static/js/studentOverloadApp.js index 26238542..55559b04 100755 --- a/app/static/js/studentOverloadApp.js +++ b/app/static/js/studentOverloadApp.js @@ -50,8 +50,8 @@ function updateDatabase(overloadFormHistoryID){ url: "/studentOverloadApp/update/" + overloadFormHistoryID, method: "POST", data: {"overloadReason": $("#notes").val()}, - success: function() { - window.location.href = '/'; + success: function(bnumber) { + window.location.replace("/laborHistory/" + bnumber); }, error: function(e) { console.log(e)