From fbcd19b54ff7b098aaa0c8135d9fb2515a1a220d Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 11 Aug 2015 15:00:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BC=96=E8=BE=91=E5=88=86=E7=8F=AD=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E7=BC=96=E8=BE=91=E6=A1=86=E9=87=8C=E8=A6=81?=
 =?UTF-8?q?=E6=9C=89=E9=BB=98=E8=AE=A4=E6=98=AF=E5=8E=9F=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?=E8=AF=A5=E7=8F=AD=E7=BA=A7=E5=90=8D=E5=AD=97=202.=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E9=80=9A=E7=9F=A5=E6=90=9C=E7=B4=A2=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E4=BB=8D=E7=84=B6=E8=BF=94=E5=9B=9E=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/news_controller.rb          | 2 +-
 app/views/courses/_new_groups_name.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 185e7128e..1a8e75b54 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -72,7 +72,7 @@ class NewsController < ApplicationController
 
         @news_count = scope.count
         @q = params[:subject]
-        if params[:subject].nil?
+        if params[:subject].nil? || params[:subject].blank?
           scope_order = scope.all(:include => [:author, :course],
                                   :order => "#{News.table_name}.created_on DESC")
         else
diff --git a/app/views/courses/_new_groups_name.html.erb b/app/views/courses/_new_groups_name.html.erb
index fc2c5a62d..6ffbb6dd2 100644
--- a/app/views/courses/_new_groups_name.html.erb
+++ b/app/views/courses/_new_groups_name.html.erb
@@ -21,7 +21,7 @@
                       <img src="/images/pic_del.gif" width="11" height="12" alt="删除班级" title="删除该班级" />
                     </a>
                 <% end%>
-                <a href="javascript:void(0)" class="f_l" style="padding-left: 5px;" onclick="$('#group_name_<%= group.id %>').val('');$('#edit_group_<%= group.id %>').slideToggle();$('#new_group_name').hide();">
+                <a href="javascript:void(0)" class="f_l" style="padding-left: 5px;" onclick="$('#group_name_<%= group.id %>').val('<%= group.name%>');$('#edit_group_<%= group.id %>').slideToggle();$('#new_group_name').hide();">
                   <img src="/images/pic_edit.png" width="14" height="15" alt="编辑班级" />
                 </a>
             <% end %>