diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 22d8deb0c..e724f7a9c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -305,10 +305,11 @@ class UsersController < ApplicationController #用户作业列表 def user_homeworks + @page = params[:page] ? params[:page].to_i + 1 : 0 user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")" - homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc") - @homework_commons = paginateHelper homework_commons,10 + @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10) respond_to do |format| + format.js format.html {render :layout => 'new_base_user'} end end diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb new file mode 100644 index 000000000..6476f9e71 --- /dev/null +++ b/app/views/users/_user_homework_list.html.erb @@ -0,0 +1,55 @@ +<% homework_commons.each do |homework_common|%> + <% is_teacher = User.current.allowed_to?(:as_teacher,homework_common.course) %> +