From b5782bae3986b0bb8881696e270793539a56a629 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 30 Sep 2016 17:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=B7=A6=E4=BE=A7=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E7=9A=84=E2=80=9C=E5=88=86=E7=8F=AD=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb   | 1 +
 app/views/courses/_tool_expand.html.erb | 3 ++-
 app/views/layouts/base_courses.html.erb | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 1b5b81a68..967e0bb58 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -379,6 +379,7 @@ class CoursesController < ApplicationController
             @no_group_count = @members_count - @course.members.where("course_group_id != 0").count
             @mem_pages = Paginator.new @members_count, @limit, @page
             @members = paginateHelper @all_members, @limit
+            @left_nav_type = 9
           else
             render_403
             return
diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb
index 8f9530e35..e5fcd8314 100644
--- a/app/views/courses/_tool_expand.html.erb
+++ b/app/views/courses/_tool_expand.html.erb
@@ -45,7 +45,8 @@
       <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
     </li>
 <% end %>
-<% if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin? %>
+<% group_count = @course.course_groups.count %>
+<% if show_nav?(group_count) && ((User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin?) %>
     <li>
       <%=link_to "分班", course_member_path(@course, :role => 2) %>
     </li>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 4f9dbbe03..fe400bfbc 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -110,10 +110,10 @@
                 <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
               </li>
           <% end %>
-          <% group_count = 1 %>
-          <% unless show_nav?(group_count) %>
+          <% group_count = @course.course_groups.count %>
+          <% if !show_nav?(group_count) && ((User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin?) %>
               <li id="sy_09" class="sy_icons_group">
-                <a href="<%=course_member_path(@course, :role => 2) %>">分班<span></span></a>
+                <a href="<%=course_member_path(@course, :role => 2) %>">分班<span><%=group_count %></span></a>
                 <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
               </li>
           <% end %>