Merge branch 'dev_course' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_course

dev_course
cxt 6 years ago
commit 38c14f9991

@ -89,10 +89,9 @@ class HomeworkCommonsController < ApplicationController
@homework_commons = @homework_commons.page(page).per(15)
if @homework_type == 4
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :shixuns, :student_works)
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :shixuns)
else
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :homework_detail_group,
:student_works)
@homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :homework_detail_group)
end
end

Loading…
Cancel
Save