|
|
@ -89,12 +89,7 @@ class HomeworkCommonsController < ApplicationController
|
|
|
|
@homework_commons = @homework_commons.page(page).per(15)
|
|
|
|
@homework_commons = @homework_commons.page(page).per(15)
|
|
|
|
|
|
|
|
|
|
|
|
if @homework_type == 4
|
|
|
|
if @homework_type == 4
|
|
|
|
if @user_course_identity == Course::STUDENT
|
|
|
|
|
|
|
|
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :shixuns,
|
|
|
|
|
|
|
|
student_works: [myshixun: [:games]])
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :shixuns, :student_works)
|
|
|
|
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :shixuns, :student_works)
|
|
|
|
end
|
|
|
|
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :homework_detail_group,
|
|
|
|
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :homework_detail_group,
|
|
|
|
:student_works)
|
|
|
|
:student_works)
|
|
|
|