From de26c97dbc2ec0b1edbe06028dde735abbea73a7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 16 Jun 2017 17:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=90=88=E4=BD=9C=E8=80=85?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=8A=E6=AC=A1=E6=90=9C=E7=B4=A2=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixuns/_add_collaborators.html.erb | 2 +-
 public/javascripts/edu/shixun.js              | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/shixuns/_add_collaborators.html.erb b/app/views/shixuns/_add_collaborators.html.erb
index 9b153f866..5c7d6f09e 100644
--- a/app/views/shixuns/_add_collaborators.html.erb
+++ b/app/views/shixuns/_add_collaborators.html.erb
@@ -19,7 +19,7 @@
               </ul>
             </div>
           </div>
-          <a href="javascript:void(0);" class="pop_close task-btn mb10" style="margin-top: 20px;">取消</a>
+          <a href="javascript:void(0);" class="task-btn mb10" style="margin-top: 20px;" onclick="reset_input();" >取消</a>
           <a href="javascript:void(0);" class="task-btn task-btn-blue" style="margin-top: 20px;" onclick="submit_add_collaborators_form()">确定</a>
       <% end %>
       <div class="cl"></div>
diff --git a/public/javascripts/edu/shixun.js b/public/javascripts/edu/shixun.js
index dddc113c5..c440b21d3 100644
--- a/public/javascripts/edu/shixun.js
+++ b/public/javascripts/edu/shixun.js
@@ -6,7 +6,9 @@ $(function() {
 
 var lastteSearchCondition = '';
 function search_not_teacher_f(e){
-    if($(e.target).val().trim() == "" || ($(e.target).val().trim() == lastteSearchCondition && lastteSearchCondition != ''))
+    console.log($(e.target).val().trim());
+    console.log(lastteSearchCondition);
+    if($(e.target).val().trim() == "")
     {
         return;
     }
@@ -27,4 +29,4 @@ function submit_add_collaborators_form(){
     }else{
         $("#add_teacher_notice").html("请至少选择一个用户").show();
     }
-}
\ No newline at end of file
+}