From 6ca702eb2c1597b510ca6ed095c43a16d711a666 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 13:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E5=8F=91=E9=80=81=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E4=B8=AD=E4=B8=8D=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E5=BD=93=E5=89=8D=E4=BD=9C=E4=B8=9A=E6=89=80=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb     | 5 +++--
 app/views/users/user_homeworks.html.erb | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 230426b91..9cdbe87a5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -422,11 +422,12 @@ class UsersController < ApplicationController
   end
 
   def choose_user_course
+    homework = HomeworkCommon.find params[:homework].to_i
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
-      @course = @user.courses.where(" #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
+      @course = @user.courses.where("#{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
     else
-      @course = @user.courses.select { |course|  @user.allowed_to?(:as_teacher,course)}
+      @course = @user.courses.where("#{Course.table_name}.id != #{homework.course_id}").select { |course|  @user.allowed_to?(:as_teacher,course)}
     end
     @search = params[:search]
     #这里仅仅是传递需要发送的资源id
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 2fa1dc791..7adaa4621 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -20,10 +20,11 @@
         if(check.length == 0) {
             $("#choose_homework_notice").text("请先选择一个作业");
         } else {
+            var hw_id = $('input[name="checkMenu"]:checked').val();
             $("#choose_homework_notice").text("");
             $.ajax({
                 type: 'get',
-                url: '/users/' + user_id + '/choose_user_course',
+                url: '/users/' + user_id + '/choose_user_course?homework='+hw_id,
                 data:{send_id:$('input[name="checkMenu"]:checked').val()}
             });
         }