From 2ab2abe9e553ed598456fbdb7c6c8f1e833f4ad8 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 10 Dec 2014 18:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=90=9C=E7=B4=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/auth.rb           |  2 ++
 app/api/mobile/apis/courses.rb        |  1 +
 app/api/mobile/apis/users.rb          |  1 +
 app/api/mobile/apis/watches.rb        |  1 +
 app/controllers/courses_controller.rb | 26 +++++++++++++++++---------
 app/services/courses_service.rb       | 21 +++++++++++++++++++++
 6 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/app/api/mobile/apis/auth.rb b/app/api/mobile/apis/auth.rb
index ae233a853..5a6c0f34f 100644
--- a/app/api/mobile/apis/auth.rb
+++ b/app/api/mobile/apis/auth.rb
@@ -1,3 +1,5 @@
+#coding=utf-8
+
 module Mobile
 
   module Entities 
diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb
index 9aeea5176..515ebce77 100644
--- a/app/api/mobile/apis/courses.rb
+++ b/app/api/mobile/apis/courses.rb
@@ -1,3 +1,4 @@
+#coding=utf-8
 module Mobile
   module Apis
     class Courses < Grape::API
diff --git a/app/api/mobile/apis/users.rb b/app/api/mobile/apis/users.rb
index d05809726..52932b883 100644
--- a/app/api/mobile/apis/users.rb
+++ b/app/api/mobile/apis/users.rb
@@ -1,3 +1,4 @@
+#coding=utf-8
 module Mobile
   module Apis
     class Users < Grape::API
diff --git a/app/api/mobile/apis/watches.rb b/app/api/mobile/apis/watches.rb
index 0715ff4a2..ce846debd 100644
--- a/app/api/mobile/apis/watches.rb
+++ b/app/api/mobile/apis/watches.rb
@@ -1,3 +1,4 @@
+#coding=utf-8
 module Mobile
   module Apis
     class Watches < Grape::API
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index bd389ff68..ac25d59cf 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -126,18 +126,21 @@ class CoursesController < ApplicationController
   # 课程搜索
   # add by nwb
   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])
-    else
-      @courses_all =  @courses;
-    end
+    #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])
+    #else
+    #  @courses_all =  @courses;
+    #end
+    cs = CoursesService.new
+    @courses_all = cs.search_course params
     @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|
@@ -194,6 +197,11 @@ class CoursesController < ApplicationController
         render_feed(courses, :title => "#{Setting.app_title}: #{l(:label_course_latest)}")
       }
     end
+
+  rescue Exception => e
+    if e.message == 'sumbit empty'
+      (redirect_to courses_url, :notice => l(:label_sumbit_empty);return)
+    end
   end
 
   def member
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 0a1fa553d..f1c2babbe 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -26,4 +26,25 @@ class CoursesService
     course_list
   end
 
+  #搜索课程
+  def search_course params
+    courses_all = Course.all_course
+    name = params[:name]
+    if name.blank?
+      raise 'sumbit empty'
+    end
+    @courses = courses_all.visible
+    if params[:name].present?
+      @courses_all = @courses.like(params[:name])
+    else
+      @courses_all =  @courses;
+    end
+    @courses_all
+  end
+
+  #获取头像
+  def get_img obj
+    url_to_avatar(obj)
+  end
+
 end
\ No newline at end of file