From ffe12b92c83a0a45c82f601352fddfef8644f716 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 22 Jul 2015 10:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=BB=E9=A2=98=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/news_controller.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 56b4a30fc..9385c73ee 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -73,8 +73,14 @@ class NewsController < ApplicationController
         @news_count = scope.count
         #@news_pages = Paginator.new @news_count, @limit, params['page']
         #@offset ||= scope_page.offset
-        scope_order = scope.all(:include => [:author, :course],
-                           :order => "#{News.table_name}.created_on DESC")
+        if params[:subject].nil?
+          scope_order = scope.all(:include => [:author, :course],
+                                  :order => "#{News.table_name}.created_on DESC")
+        else
+          scope_order = scope.where("news.title like '#{'%' << params[:subject].to_s << '%'}'").all(:include => [:author, :course],
+                                                                                    :order => "#{News.table_name}.created_on DESC")
+        end
+
                            # :offset => @offset,
                            # :limit => @limit)
         @newss = paginateHelper scope_order,10
@@ -83,6 +89,7 @@ class NewsController < ApplicationController
             @news = News.new
             render :layout => 'base_courses'
           }
+          format.js
           format.api
           format.atom { render_feed(@newss, :title => (@course ? @course.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
         end
@@ -141,7 +148,7 @@ class NewsController < ApplicationController
           ids = params[:asset_id].split(',')
           update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
         end
-        # 与我相关动态的记录add start
+        # 锟斤拷锟斤拷锟斤拷囟锟教拷募锟铰糰dd start
         teachers = searchTeacherAndAssistant(@course)
         for teacher in teachers
           if(teacher.user_id != User.current.id)
@@ -155,7 +162,7 @@ class NewsController < ApplicationController
             notify.save()
           end
         end
-        # 与我相关动态的记录add end
+        # 锟斤拷锟斤拷锟斤拷囟锟教拷募锟铰糰dd end
         render_attachment_warning_if_needed(@news)
         flash[:notice] = l(:notice_successful_create)
         redirect_to course_news_index_url(@course)