File tree 3 files changed +7
-3
lines changed
3 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -262,6 +262,11 @@ def email_settings_with_enabled_components
262
262
setting_emails . where ( component : email_settings_enabled_components )
263
263
end
264
264
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
+
265
270
private
266
271
267
272
# Set default values
Original file line number Diff line number Diff line change @@ -135,7 +135,7 @@ def personal_time_for(course_user)
135
135
136
136
def reference_time_for ( course_user )
137
137
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 )
139
139
140
140
# This reversion anticipates if course_user is on a non-default timeline which does not override the
141
141
# default time for this lesson plan item.
Original file line number Diff line number Diff line change @@ -7,8 +7,7 @@ json.name course_user.name.strip
7
7
json . imageUrl user_image ( course_user . user )
8
8
json . email course_user . user . email
9
9
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 )
12
11
json . timelineAlgorithm course_user . timeline_algorithm if should_show_timeline
13
12
14
13
json . role course_user . role
You can’t perform that action at this time.
0 commit comments