From fa731718185db09ea8cdf9e3c43f65d02adfbc21 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 1 Jun 2016 14:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E2=80=9C=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=B4=BB=E8=B7=83=E5=BA=A6=E2=80=9D=E5=92=8C=E2=80=9C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E8=8B=B1=E9=9B=84=E6=A6=9C=E2=80=9D=E8=B7=B3=E5=88=B0?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=EF=BC=8C=E5=B9=B6=E5=88=86?=
 =?UTF-8?q?=E5=88=AB=E4=BB=A5=E2=80=9C=E6=B4=BB=E8=B7=83=E5=BA=A6=E2=80=9D?=
 =?UTF-8?q?=E3=80=81=E2=80=9C=E8=8B=B1=E9=9B=84=E6=A6=9C=E2=80=9D=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb             | 4 ++--
 app/views/courses/_course_activity_users.html.erb | 7 ++++++-
 app/views/courses/_course_heroes.html.erb         | 7 ++++++-
 app/views/courses/_new_member_list.html.erb       | 2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 17f62f18c..e421b8c69 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -304,7 +304,7 @@ class CoursesController < ApplicationController
 
       @render_file = 'new_member_list'
       @score_sort_by = "desc"
-      @sort_type = "score"
+      @sort_type = params[:sort_type] ? params[:sort_type] : "score"
       @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
       @role = params[:role].nil? ?  '2':params[:role]
       @is_remote = true
@@ -319,7 +319,7 @@ class CoursesController < ApplicationController
           if @course.open_student == 1 || User.current.member_of_course?(@course)
             @subPage_title = l :label_student_list
             page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
-            @all_members = student_homework_score(0,page, 10,@score_sort_by)
+            @all_members = student_homework_score(0,page, 10,@score_sort_by,@sort_type)
             @members =  @all_members
           else
             render_403
diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb
index a0cac45f7..93e0e7b77 100644
--- a/app/views/courses/_course_activity_users.html.erb
+++ b/app/views/courses/_course_activity_users.html.erb
@@ -1,6 +1,11 @@
 <% unless contributor_course_scor(course.id).count == 0 %>
     <ul class="rankList">
-      <h4>课程活跃度
+      <h4>
+        <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
+            <%= link_to "课程活跃度", course_member_path(course, :role => 2, :sort_type => 'act_score'), :class => '' %>
+        <% else %>
+            课程活跃度
+        <% end %>
         <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
       </h4>
       <div  class="numIntro undis" style="cursor:pointer;">
diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb
index 5e9851594..9542f87a9 100644
--- a/app/views/courses/_course_heroes.html.erb
+++ b/app/views/courses/_course_heroes.html.erb
@@ -1,7 +1,12 @@
 <% hero_homework_scores = hero_homework_score(course, "desc") %>
 <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
     <ul class="rankList">
-      <h4><span>课程英雄榜</span>
+      <h4>
+        <% if (User.current.logged? && course.open_student == 1) || (User.current.member_of_course?(course)) || User.current.admin? %>
+            <%= link_to "课程英雄榜", course_member_path(course, :role => 2), :class => '' %>
+        <% else %>
+            <span>课程英雄榜</span>
+        <% end %>
         <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
       <div  style="cursor:pointer;" class="numIntro undis">
         <div class="hero-degree-rule">积分规则<br/>
diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index d8a2c6ed8..747b37c03 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -26,7 +26,7 @@
         <li  class="ml10" style="padding-right: 15px;"><span class="fontGrey6 fb">学号</span></li>
         <li style="padding-right: 55px; margin-left: 160px;"><span class="fontGrey6 fb">分班</span></li>
         <li class="st_list_score ml10">
-          <%= link_to '作业积分', member_score_sort_course_path(:sort_type => 'score', :sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true, :class => 'ml25'%>
+          <%= link_to '英雄榜', member_score_sort_course_path(:sort_type => 'score', :sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true, :class => 'ml35'%>
           <% if @sort_type == "score" && @score_sort_by == 'desc' %>
               <a id="pic" href="javascript:" class= "st_down"></a>
           <% elsif @sort_type == "score" && @score_sort_by == 'asc' %>