From 90a01c8d84b615abc1daa43e3e402361659499d1 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 9 Dec 2014 15:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=8A=E6=B7=BB=E5=8A=A0=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=8F=AD=E5=86=85=E6=90=9C=E7=B4=A2=E5=92=8C=E8=AF=BE=E5=86=85?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E3=80=8B=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?=
 =?UTF-8?q?=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   |  6 ++--
 app/helpers/courses_helper.rb           |  2 +-
 app/views/courses/_groups_name.html.erb | 36 ------------------------
 app/views/courses/_member_list.html.erb |  6 ++--
 app/views/courses/member.html.erb       | 37 +++++++++++++++++++++++++
 config/locales/zh.yml                   |  2 ++
 6 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 788237444..326ae0f42 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -207,9 +207,9 @@ class CoursesController < ApplicationController
       #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
     if params[:incourse]
       @results = searchStudent_by_name(@course, q)
-    else
-      group = CourseGroup.find(params[:search_group_id])
-      @results = searchgroupstudent_by_name(group, @course, q)
+    elsif params[:ingroup]
+      @group = CourseGroup.find(params[:search_group_id])
+      @results = searchgroupstudent_by_name(@group, @course, q)
     end
     @result_count = @results.count
     @results = paginateHelper @results
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index bf3810030..a1199a55a 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -184,7 +184,7 @@ module CoursesHelper
     end
     members
   end
-  def searchgroupstudent_by_name(group, project, q)
+  def searchgroupstudent_by_name(group, project, name)
     members = []
     group.members.each do |m|
       if m && m.user && m.user.allowed_to?(:as_student,project)
diff --git a/app/views/courses/_groups_name.html.erb b/app/views/courses/_groups_name.html.erb
index 68baa2ccd..ca0fed9c2 100644
--- a/app/views/courses/_groups_name.html.erb
+++ b/app/views/courses/_groups_name.html.erb
@@ -1,40 +1,4 @@
-<script type=" text/javascript" charset="utf-8">
-    function validate_groupname(value1) {
 
-        if(value1.length > 20) {
-            alert('<%= l(:label_limit_groupname) %>');
-        }
-    }
-    function checkclass(value) {
-
-        for(var i = 0; i < document.getElementsByName("check_group_name").length; i++) {
-            if(document.getElementsByName("check_group_name")[i].id == value) {
-                document.getElementById(value).className = "selected";
-            }
-            else {
-                document.getElementsByName("check_group_name")[i].className = "classbox";
-            }
-
-        }
-    }
-    function validate_groupname_null(value1) {
-         value1 = value1.trim();
-        if(value1.length == 0 ) {
-            alert('<%= l(:label_limit_groupname_null) %>');
-        }
-    }
-    function validate_update(name) {
-         value1 = document.getElementById(name).value;
-        validate_groupname(value1);
-
-    }
-    function validate_add_group() {
-         value1 = document.getElementById('group_name').value;
-        validate_groupname(value1);
-        validate_groupname_null(value1);
-
-    }
-</script>
 
 
     <ul>
diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index b77d359d0..c6c20b542 100644
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@@ -9,10 +9,10 @@
       <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px"%>
           <% if @group %>
-              <%= hidden_field "#{@group.id}", params[:search_group_id], name: 'search_group_id' %>
-             <%= submit_tag l(:label_search), :name => "ingroup",:class => "f_2"%>
+              <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
+             <%= submit_tag l(:label_search_member_in_group), :name => "ingroup",:class => "f_2"%>
           <% end %>
-          <%= submit_tag l(:label_search), :name => 'incourse',:class => "f_2"%>
+          <%= submit_tag l(:label_search_member_in_course), :name => 'incourse',:onclick => "checkclass('group_name_0')",:class => "f_2"%>
           <%#= link_to l(:label_search),'' , :class => 'f_2' %>
       <% end %>
   <% end %>
diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb
index fb317acf6..b426e4a3e 100644
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@@ -1,3 +1,40 @@
+<script type=" text/javascript" charset="utf-8">
+    function validate_groupname(value1) {
+
+        if(value1.length > 20) {
+            alert('<%= l(:label_limit_groupname) %>');
+        }
+    }
+    function checkclass(value) {
+
+        for(var i = 0; i < document.getElementsByName("check_group_name").length; i++) {
+            if(document.getElementsByName("check_group_name")[i].id == value) {
+                document.getElementById(value).className = "selected";
+            }
+            else {
+                document.getElementsByName("check_group_name")[i].className = "classbox";
+            }
+
+        }
+    }
+    function validate_groupname_null(value1) {
+        value1 = value1.trim();
+        if(value1.length == 0 ) {
+            alert('<%= l(:label_limit_groupname_null) %>');
+        }
+    }
+    function validate_update(name) {
+        value1 = document.getElementById(name).value;
+        validate_groupname(value1);
+
+    }
+    function validate_add_group() {
+        value1 = document.getElementById('group_name').value;
+        validate_groupname(value1);
+        validate_groupname_null(value1);
+
+    }
+</script>
 <%= stylesheet_link_tag  'course_group', :media => 'all' %>
 <script type="text/javascript" src="javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js"></script>
 <div class="st_list">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f7ff4374a..fccf78563 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -570,6 +570,8 @@ zh:
   label_role_new: 新建角色
   label_role_and_permissions: 角色和权限
   label_member: 成员
+  label_search_member_in_group: 班内搜索
+  label_search_member_in_course: 课内搜索
   label_search_member_count: 共搜索到
   label_member_people: 人
   label_delete_group: 确定删除分班？