From d3e7f484ca22406f600892a3d43831fc989bfecd Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 11 Dec 2014 15:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=20#1684=20=E6=9F=90=E8=AF=BE=E7=A8=8B=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5--=E4=B8=8D=E8=BE=93=E5=85=A5=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E7=9B=B4=E6=8E=A5=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E8=BF=94=E5=9B=9E404?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 85 +++++++++++++++------------
 1 file changed, 46 insertions(+), 39 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 326ae0f42..bf964fbaf 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -130,57 +130,64 @@ class CoursesController < ApplicationController
   def search
     courses_all = Course.all_course
     name = params[:name]
-    (redirect_to courses_url, :notice => l(:label_sumbit_empty);return) if name.blank?
-    @courses = courses_all.visible
-    if params[:name].present?
-      @courses_all = @courses.like(params[:name])
+    #(redirect_to courses_url, :notice => l(:label_sumbit_empty);return) if name.blank?
+    if name.blank?
+      @courses = []
+      @courses_all = []
+      @course_count = 0
+      @course_pages = Paginator.new @course_count, per_page_option, params['page']
     else
-      @courses_all =  @courses;
-    end
-    @course_count = @courses_all.count
-    @course_pages = Paginator.new @course_count, per_page_option, params['page']
+      @courses = courses_all.visible
+      if params[:name].present?
+        @courses_all = @courses.like(params[:name])
+      else
+        @courses_all =  @courses;
+      end
+      @course_count = @courses_all.count
+      @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
+      # 课程的动态数
+      @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)
+      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
+          @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)
+        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
+          @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)
+        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
+          @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]
+        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)
+        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
+          @course_activity_count=get_course_activity @courses,@course_activity_count
 
+      end
     end
 
     respond_to do |format|