Skip to content

Commit 3d0bd7c

Browse files
committed
Make v8 courses/{course_id}/exercises to show all
1 parent 5a162e6 commit 3d0bd7c

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

app/controllers/api/v8/courses/exercises_controller.rb

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,25 @@ def index
4646
exercises.where(unlock_spec: nil)
4747
else
4848
exercises.where(["unlock_spec IS NULL OR name IN (#{unlocked_exercises.map { |_| '?' }.join(', ')})", *unlocked_exercises])
49-
end.select { |e| e._fast_visible_to?(current_user) }
49+
end
5050
end
5151

52-
presentable = exercises.map do |ex|
52+
exercises = exercises.pluck(:id)
53+
54+
all_exercises = course.exercises
55+
.where(hidden: false, disabled_status: 0)
56+
.select { |ex| ex._fast_visible_to?(current_user) }
57+
58+
presentable = all_exercises.map do |ex|
5359
{
5460
id: ex.id,
5561
available_points: ex.available_points,
5662
name: ex.name,
5763
publish_time: ex.publish_time,
5864
solution_visible_after: ex.solution_visible_after,
5965
deadline: ex.deadline_for(current_user),
60-
disabled: ex.disabled?
66+
disabled: ex.disabled?,
67+
unlocked: exercises.include?(ex.id)
6168
}
6269
end
6370

0 commit comments

Comments
 (0)