From 6ab2c15504e707e2f021cb2085d90c8a13ffb71d Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 26 Jul 2016 10:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=88=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=8B=E7=9A=84=E6=9F=90=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E5=88=A0=E9=99=A4=E8=AF=A5=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb     | 1 +
 app/controllers/syllabuses_controller.rb       | 2 +-
 app/views/syllabuses/_delete_syllabus.html.erb | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 966f23a3c..e2dd23552 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -381,6 +381,7 @@ class StudentWorkController < ApplicationController
     @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
     @show_all = false
 
+    # 0表示没有分组的学生，-1表示所有分组的学生
     if @group
       if @group == "0"
         none_group_students = @course.members.select{ |member| member.course_group_id == 0 }
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 9c69f5259..e77b19511 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -88,7 +88,7 @@ class SyllabusesController < ApplicationController
   end
 
   def destroy
-    if @syllabus && @syllabus.courses.empty?
+    if @syllabus && @syllabus.courses.not_deleted.empty?
       @syllabus.destroy
       redirect_to user_courselist_user_path(User.current.id)
     end
diff --git a/app/views/syllabuses/_delete_syllabus.html.erb b/app/views/syllabuses/_delete_syllabus.html.erb
index b043186aa..a72a87c03 100644
--- a/app/views/syllabuses/_delete_syllabus.html.erb
+++ b/app/views/syllabuses/_delete_syllabus.html.erb
@@ -1,6 +1,6 @@
 <br>
 <div style='width:470px;text-align:center;font-family: "微软雅黑","宋体"' class="f14">
-  <% if @syllabus.courses.empty? || @syllabus.courses.not_deleted.empty? %>
+  <% if @syllabus.courses.not_deleted.empty? %>
     确认删除该课程吗？
   <% else %>
     该课程下已经存在班级，不能删除。
@@ -8,7 +8,7 @@
 </div>
 </br>
 <div style='width:164px; margin:0 auto; text-align:center; font-family: "微软雅黑","宋体"'>
-  <% if @syllabus.courses.empty?|| @syllabus.courses.not_deleted.empty? %>
+  <% if @syllabus.courses.not_deleted.empty? %>
       <%=link_to '确认', syllabus_path(@syllabus), :class => 'Blue-btn fl', :method => 'delete'%>
       <a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>关闭</a>
   <% else %>