Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f038336
Merge pull request #1720 from BCStudentSoftwareDevTeam/Bhushan&Artem
BrianRamsay Jun 16, 2026
0ed7a1e
scaling issues on buttons on course proposals is fixed
munsakad Jun 16, 2026
53ac15d
Merge branch 'development' into bright_and_dee-course_proposal_button…
munsakad Jun 16, 2026
a0a2d27
Ignore SSL connection to mysql in devcontainer
BrianRamsay Jun 16, 2026
a3f03d4
Fixed buttons and scaling at the bottom of all three pages, including…
munsakad Jun 16, 2026
19e3d99
Merge branch 'development' into bright_and_dee-course_proposal_button…
MImran2002 Jun 16, 2026
defc0bb
Revert changes to emergencyContactInfo and insuranceInfo
munsakad Jun 16, 2026
7f62397
Move page indicator below buttons so right buttons never go under dots
munsakad Jun 16, 2026
60f10ef
Fix button scaling and layout on emergencyContactInfo and insuranceInfo
munsakad Jun 16, 2026
885d5b1
Add user-facing error handling to withdraw ajax request
munsakad Jun 16, 2026
664991a
Revert unrelated files from exception handling branch
Jun 17, 2026
d1551aa
Use flash message for withdraw errors
Jun 17, 2026
e89ec90
Merge branch 'development' into feitsopb_dee_exceptionhandling
MImran2002 Jun 17, 2026
a2cddad
Merge branch 'development' into feitsopb_dee_exceptionhandling
Jun 17, 2026
5c6b519
Display withdraw error message inside modal instead of page flash
munsakad Jun 17, 2026
28154c3
Merge branch 'feitsopb_dee_exceptionhandling' of https://github.com/B…
Jun 17, 2026
ab6b6fc
Use flash message for SLC withdraw errors
Jun 17, 2026
c49016e
Merge branch 'development' into feitsopb_dee_exceptionhandling
MImran2002 Jun 18, 2026
d605519
Handle SLC withdraw response status
Jun 18, 2026
acfc5a7
Reload SLC management after withdraw error
Jun 18, 2026
042bc0c
resolved the suggestions
Jun 18, 2026
8be7e05
resolved comment R200
Jun 18, 2026
0d75745
removed complete function from line 145 in slcManagemnet.js
Jun 18, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/controllers/serviceLearning/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,14 @@ def withdrawCourse(courseID):
if g.current_user.isAdmin or g.current_user.isFaculty:
withdrawProposal(courseID)
flash("Course successfully withdrawn", 'success')
return ""
else:
flash("Unauthorized to perform this action", 'warning')
except Exception as e:
Comment on lines 205 to 211

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we are adding server codes return "", 500 should be nested in the exception or else and internal server outside of the exception doesn't make sense for me if exception is catching the errors. What do you think @BrianRamsay ? Should the other catches also consider 200 and 403?

print(e)
flash("Withdrawal Unsuccessful", 'warning')
return ""

return "", 500


@serviceLearning_bp.route('/proposalReview/', methods = ['GET', 'POST'])
Expand Down
8 changes: 2 additions & 6 deletions app/static/js/slcManagement.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function renew(){
location = '/serviceLearning/editProposal/' + newID;
},
error: function(request, status, error) {
console.log(status,error);
Comment thread
brightfietsop-ux marked this conversation as resolved.
location.reload();
}
})
resetAllSelections()
Expand All @@ -140,12 +140,8 @@ function withdraw(){
location.reload();
},
error: function(request, status, error) {
console.log(status,error);

location.reload();
},
done: function () {
$('#' + courseID).val('---');
}
});
};

Expand Down
Loading