diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index aa66dd7a0..71715035e 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -124,47 +124,47 @@ class CoursesController < ApplicationController @course_pages = Paginator.new @course_count, per_page_option, params['page'] # 课程的动态数 - @course_activity_count=Hash.new - @courses_all.each do |course| - @course_activity_count[course.id]=0 - end - - case params[:course_sort_type] - when '0' - @courses = @courses_all.order("created_at desc") - @s_type = 0 - @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) - - @course_activity_count=get_course_activity @courses,@course_activity_count - - when '1' - @courses = @courses_all.order("course_ac_para desc") - @s_type = 1 - @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) - - @course_activity_count=get_course_activity @courses,@course_activity_count - - when '2' - @courses = @courses_all.order("watchers_count desc") - @s_type = 2 - @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) - - @course_activity_count=get_course_activity @courses,@course_activity_count - - when '3' - @course_activity_count=get_course_activity @courses_all,@course_activity_count_array - @courses=handle_course @courses_all,@course_activity_count - @s_type = 3 - @courses = @courses[@course_pages.offset, @course_pages.per_page] - - else - @s_type = 0 - @courses = @courses_all.order("created_at desc") - @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) - - @course_activity_count=get_course_activity @courses,@course_activity_count - - end + # @course_activity_count=Hash.new + # @courses_all.each do |course| + # @course_activity_count[course.id]=0 + # end + # + # case params[:course_sort_type] + # when '0' + # @courses = @courses_all.order("created_at desc") + # @s_type = 0 + # @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) + # + # @course_activity_count=get_course_activity @courses,@course_activity_count + # + # when '1' + # @courses = @courses_all.order("course_ac_para desc") + # @s_type = 1 + # @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) + # + # @course_activity_count=get_course_activity @courses,@course_activity_count + # + # when '2' + # @courses = @courses_all.order("watchers_count desc") + # @s_type = 2 + # @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) + # + # @course_activity_count=get_course_activity @courses,@course_activity_count + # + # when '3' + # @course_activity_count=get_course_activity @courses_all,@course_activity_count_array + # @courses=handle_course @courses_all,@course_activity_count + # @s_type = 3 + # @courses = @courses[@course_pages.offset, @course_pages.per_page] + # + # else + # @s_type = 0 + # @courses = @courses_all.order("created_at desc") + # @courses = @courses.offset(@course_pages.offset).limit(@course_pages.per_page) + # + # @course_activity_count=get_course_activity @courses,@course_activity_count + # + # end end respond_to do |format| diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb index 0b879f905..889319d5e 100644 --- a/app/views/courses/_course.html.erb +++ b/app/views/courses/_course.html.erb @@ -61,8 +61,8 @@

- <%= content_tag('span', link_to("#{course_activity_count @course}", course_path(@course)), :class => "info") %> - <%= content_tag('span', l(:label_x_activity, :count => @course_activity_count[@course.id])) %> + <%= content_tag('span', link_to("#{@course.course_activities.count}", course_path(@course)), :class => "info") %> + <%= content_tag('span', l(:label_x_activity, :count => @course.course_activities.count)) %>