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

Avoid 403 errors when a user cannot access linked saved annotations #4902

Merged
merged 4 commits into from
Aug 17, 2023
Merged

Avoid 403 errors when a user cannot access linked saved annotations #4902

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fa5924
Avoid 403 errors when a user cannot access linked saved annotations
jorg-vr Aug 16, 2023
6820df5
Remove unneeded change
jorg-vr Aug 16, 2023
abd094a
Add comment
jorg-vr Aug 16, 2023
239d015
Do not add newline
jorg-vr Aug 16, 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
5 changes: 4 additions & 1 deletion app/views/annotations/_annotation.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
json.extract! annotation, :id, :line_nr, :annotation_text, :user_id, :submission_id, :saved_annotation_id, :created_at, :updated_at, :course_id, :column, :rows, :columns
json.extract! annotation, :id, :line_nr, :annotation_text, :user_id, :submission_id, :created_at, :updated_at, :course_id, :column, :rows, :columns
json.row annotation.line_nr || 0
if annotation.is_a?(Question)
json.extract! annotation, :question_state
Expand Down Expand Up @@ -41,3 +41,6 @@ json.responses annotation.responses do |response|
json.partial! response, as: :annotation
end
json.thread_root_id annotation.thread_root_id

# Only include the saved annotation id if the user is allowed to see it
json.saved_annotation_id annotation.saved_annotation_id if annotation.saved_annotation.present? && SavedAnnotationPolicy.new(current_user, annotation.saved_annotation).show?
jorg-vr marked this conversation as resolved.
Show resolved Hide resolved