Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restricted permissions to the course management page #934

Merged
merged 6 commits into from
Jun 15, 2023
Merged

Restricted permissions to the course management page #934

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f97abc1
Redirected Users who are not admin or Faculty to Warning Page
stevensonmichel Jun 14, 2023
1fcba60
Caught the user does not exist exception and the page aborts to a 403…
hoerstl Jun 15, 2023
4bdc120
Merge branch 'development' into Individual-course-management-929
hoerstl Jun 15, 2023
491275b
Fixed the behavior of the redirect target to be the page on our websi…
hoerstl Jun 15, 2023
4de0cf9
Merge branch 'Individual-course-management-929' of github.com:BCStude…
hoerstl Jun 15, 2023
2ad429f
Merge branch 'development' into Individual-course-management-929
hoerstl Jun 15, 2023
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
15 changes: 9 additions & 6 deletions app/controllers/serviceLearning/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,23 @@
@serviceLearning_bp.route('/serviceLearning/courseManagement', methods = ['GET'])
@serviceLearning_bp.route('/serviceLearning/courseManagement/<username>', methods = ['GET'])
def serviceCourseManagement(username=None):
if g.current_user.isStudent:
abort(403)
if g.current_user.isCeltsAdmin or g.current_user.isFaculty:
setRedirectTarget("/serviceLearning/courseManagement")
try:
user = User.get(User.username==username) if username else g.current_user
except DoesNotExist:
abort(404)

isRequestingForSelf = g.current_user == user
if g.current_user.isCeltsAdmin or (g.current_user.isFaculty and isRequestingForSelf):
setRedirectTarget("/serviceLearning/courseManagement")
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of always coming back to /serviceLearning/courseManagement in setRedirectTarget, we should come back to the original route they came in on (including the username if necessary). Check out the flask request object

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On it!

courseDict = getServiceLearningCoursesData(user)
termList = selectSurroundingTerms(g.current_term, prevTerms=0)
return render_template('serviceLearning/slcManagement.html',
user=user,
courseDict=courseDict,
termList=termList)
else:
flash("Unauthorized to view page", 'warning')
return redirect(url_for('main.events', selectedTerm=g.current_term))
abort(403)


@serviceLearning_bp.route('/serviceLearning/viewProposal/<courseID>', methods=['GET'])
@serviceLearning_bp.route('/serviceLearning/editProposal/upload/<courseID>', methods=['GET'])
Expand Down