From ab4a8136c4f33ae8feffd90c020079cf591e8402 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 30 Jun 2017 19:10:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E9=A6=96=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 8 ++++++++ app/views/courses/_courseList.html.erb | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index ccf9383dd..5e17350d7 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -62,6 +62,14 @@ class CoursesController < ApplicationController @syllabuses = all_syllabuses end + @syllabuses.each do |course| + course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count + course.members.count) : (course.homework_commons.where("publish_time <= '#{Time.now}'").count + visable_attachemnts_incourse(course).count + course.members.count) + if course[:infocount] < 0 + course[:infocount] = 0 + end + end + @syllabuses = @syllabuses.sort{|x,y| y[:infocount] <=> x[:infocount] } + @syllabuses_count = @syllabuses.count @limit = 16 @is_remote = true diff --git a/app/views/courses/_courseList.html.erb b/app/views/courses/_courseList.html.erb index a3dfe4c9c..907e052d4 100644 --- a/app/views/courses/_courseList.html.erb +++ b/app/views/courses/_courseList.html.erb @@ -25,8 +25,10 @@

- <% syResource = visable_attachemnts_incourse(sy) %> - <% syHome = visable_course_homework(sy) %> + <% syMembers = sy.members.count %> + <% syResource = visable_attachemnts_incourse(sy) %> + <% syHome = visable_course_homework(sy) %> + <%= syMembers %> <%= syResource.count %> <%= syHome %>