From 646678c9db4278ae42d717bd3d4608d6ecd47e6a Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 2 Feb 2015 17:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E8=AF=BE=E7=A8=8B--?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=EF=BC=9A=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9D=A1=E4=BB=B6=E8=8E=B7=E5=BE=97=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=AF=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8C=89=E7=A7=AF=E5=88=86=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=B4=E8=87=AA=E5=8A=A8=E8=BF=94=E5=9B=9E=E5=AF=B9?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AD=A6=E7=94=9F=E6=8E=92=E5=BA=8F=E3=80=8B?=
 =?UTF-8?q?bug=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb   | 35 ++++++++++++++++++-------
 app/views/courses/_member_list.html.erb |  2 +-
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 7653be94d..61944ca2c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -254,8 +254,8 @@ class CoursesController < ApplicationController
     end
     @is_remote = true
     @result_count = @results.count
-    @results = paginateHelper @results
-
+    @results = paginateHelper @results, 10
+    @search_name = q
   end
 
   def addgroups
@@ -428,17 +428,34 @@ class CoursesController < ApplicationController
     # @results = paginateHelper @results@score_sort_by = "desc"
     @is_remote = true
     @score_sort_by = params[:sort_by] if params[:sort_by]
+    @search_name = params[:search_name] if params[:search_name]
     group_id = params[:group_id]
-    if group_id == '0'
-      page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-      @results = student_homework_score(0,page, 10,@score_sort_by)
+    if !@search_name.nil?
+      if group_id == '0'
+        page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
 
-      @results = paginateHelper_for_members @results, 10
+        @results = searchmember_by_name(student_homework_score(0,0,0,@score_sort_by), @search_name)
+        @result_count = @results.count
+        @results = paginateHelper @results, 10
+      else
+        @group = CourseGroup.find(group_id)
+        @results = searchmember_by_name(student_homework_score(group_id, 0, 0,@score_sort_by),@search_name)
+        @result_count = @results.count
+        @results = paginateHelper @results, 10
+      end
     else
-      @group = CourseGroup.find(group_id)
-      @results = student_homework_score(group_id, 0, 0,@score_sort_by)
-      @results = paginateHelper @results, 10
+      if group_id == '0'
+        page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
+        @results = student_homework_score(0,page, 10,@score_sort_by)
+
+        @results = paginateHelper_for_members @results, 10
+      else
+        @group = CourseGroup.find(group_id)
+        @results = student_homework_score(group_id, 0, 0,@score_sort_by)
+        @results = paginateHelper @results, 10
+      end
     end
+
   end
   # 显示每个学生的作业评分详情
   def show_member_score
diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index dd543ec2c..11bfd9f81 100644
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@@ -25,7 +25,7 @@
     <div class="st_box">
       <ul class="st_box_top" style="margin-left: 17px;">
         <% if @subPage_title == l(:label_student_list) %>
-            <li class="ml358"><%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0)) ,:result => members,method: 'get', remote: true%>
+            <li class="ml358"><%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
              <% if @score_sort_by == 'desc' %>
               <a id="pic" href="#" class= "st_down"></a>
             <% else %>