From 39c23653386ef012e7644e726e0e10e9a7b817e1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 3 May 2016 10:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=8B=92=E7=BB=9D=E7=9A=84=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89=E4=BD=9C=E4=B8=9A=E4=B8=8D=E5=8F=AF=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb       | 4 ++--
 app/views/users/choose_user_course.js.erb | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f0a884a54..a9b67e0cf 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -477,8 +477,8 @@ class UsersController < ApplicationController
       ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:send_id].to_i)
       if ah.empty?
         @status = 2
-      elsif ah.first.status == 1
-        @status = 1
+      elsif ah.first.status != 2
+        @status = ah.first.status
       end
     end
     if !params[:search].nil?
diff --git a/app/views/users/choose_user_course.js.erb b/app/views/users/choose_user_course.js.erb
index 77c8d2522..51af05782 100644
--- a/app/views/users/choose_user_course.js.erb
+++ b/app/views/users/choose_user_course.js.erb
@@ -2,6 +2,8 @@
     alert("您的申请尚未通过审核，暂时不可发送至课程");
 <% elsif @status == 2 %>
     alert("该作业是私有的，请先提交申请并通过审核后再发送");
+<% elsif @status == 3 %>
+    alert("您的申请已被拒绝，不可发送至课程");
 <% else %>
     <% if params[:is_observe].nil? %>
     $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>');