File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -7,12 +7,7 @@ class SchoolClassesController < ApiController
77 before_action :load_and_authorize_school_class
88
99 def index
10- if current_user &.school_teacher? ( @school ) || current_user &.school_owner? ( @school )
11- school_classes = @school . classes . accessible_by ( current_ability ) . includes ( :lessons )
12- else
13- school_classes = @school . classes . accessible_by ( current_ability )
14- end
15-
10+ school_classes = accessible_school_classes
1611 school_classes = school_classes . joins ( :teachers ) . where ( teachers : { teacher_id : current_user &.id } ) if params [ :my_classes ] == 'true'
1712 @school_classes_with_teachers = school_classes . with_teachers
1813
@@ -111,6 +106,14 @@ def find_or_create_school_class(school_class_params)
111106 )
112107 end
113108
109+ def accessible_school_classes
110+ if current_user &.school_teacher? ( @school ) || current_user &.school_owner? ( @school )
111+ @school . classes . accessible_by ( current_ability ) . includes ( :lessons )
112+ else
113+ @school . classes . accessible_by ( current_ability )
114+ end
115+ end
116+
114117 def create_school_students ( school_students_params , school_class )
115118 return { school_students : [ ] , errors : nil } unless school_class . present? && school_students_params . present?
116119
You can’t perform that action at this time.
0 commit comments