翻页问题

dev_cs_new
daiao 6 years ago
parent cd01c6947e
commit 797202be88

@ -1347,6 +1347,7 @@ class HomeworkCommonsController < ApplicationController
def group_list
@page = params[:page] || 1
@limit = params[:limit] || 10
@course_member_count = @course.course_groups.count
@course_groups = @course.course_groups.page(@page).per(@limit)
@ungroup_user_ids = @course.course_members.ungroup_students.pluck(:user_id)
end

@ -7,8 +7,8 @@ json.group_list do
end
end
# 未分班展示情况放在最后
if (@course_groups.count != (@page.to_i - 1)*@limit.to_i && @course_groups.count < @limit.to_i) ||
(@page.to_i == 1 && @course_groups.count == 0)
if (@course_groups.count != @limit.to_i && @course_groups.count < @limit.to_i) ||
((@page.to_i - 1)*@limit.to_i == @course_member_count && @course_groups.count == 0)
ungroup_work_count = homework_ungroup_works_count(@homework, @ungroup_user_ids)
if ungroup_work_count > 0
json.ungroup_list do

Loading…
Cancel
Save