Skip to content

Commit 1dec964

Browse files
style(course): add reference_timeline_for
1 parent 0ae8009 commit 1dec964

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

app/models/course.rb

+5
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@ def email_settings_with_enabled_components
262262
setting_emails.where(component: email_settings_enabled_components)
263263
end
264264

265+
def reference_timeline_for(course_user)
266+
# TODO: [PR#5491] Return only `default_reference_timeline.id` if Multiple Reference Timelines component is disabled.
267+
course_user&.reference_timeline_id || default_reference_timeline.id
268+
end
269+
265270
private
266271

267272
# Set default values

app/models/course/lesson_plan/item.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def personal_time_for(course_user)
135135

136136
def reference_time_for(course_user)
137137
default_reference_timeline_id = course.default_reference_timeline.id
138-
reference_timeline_id = course_user&.reference_timeline_id || default_reference_timeline_id
138+
reference_timeline_id = course.reference_timeline_for(course_user)
139139

140140
# This reversion anticipates if course_user is on a non-default timeline which does not override the
141141
# default time for this lesson plan item.

app/views/course/users/_user_list_data.json.jbuilder

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ json.name course_user.name.strip
77
json.imageUrl user_image(course_user.user)
88
json.email course_user.user.email
99

10-
reference_timeline_id = course_user.reference_timeline_id
11-
json.referenceTimelineId reference_timeline_id || current_course.default_reference_timeline.id
10+
json.referenceTimelineId current_course.reference_timeline_for(course_user)
1211
json.timelineAlgorithm course_user.timeline_algorithm if should_show_timeline
1312

1413
json.role course_user.role

0 commit comments

Comments
 (0)