From 4ccde9d71c5e6d348139be32d84ef20430e9d5eb Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Fri, 5 Jul 2019 11:30:22 +0800
Subject: [PATCH] fix

---
 app/controllers/competition_teams_controller.rb | 3 ++-
 app/views/competition_teams/show.html.erb       | 4 +++-
 app/views/competitions/_header.html.erb         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/competition_teams_controller.rb b/app/controllers/competition_teams_controller.rb
index 6ecbb9aa..5b46986a 100644
--- a/app/controllers/competition_teams_controller.rb
+++ b/app/controllers/competition_teams_controller.rb
@@ -26,10 +26,11 @@ class CompetitionTeamsController < ApplicationController
                            .where('exists(select 1 from games where games.myshixun_id = myshixuns.id and games.status = 2)')
                            .group('shixun_id').count
 
+    # todo：使用新版course_members
     course_ids = Course.joins('join members on members.course_id = courses.id')
                    .joins('join member_roles on member_roles.member_id = members.id and member_roles.role_id in (3,7,9)')
                    .where(members: { user_id: @team_user_ids }).pluck(:id)
-    courses = Course.where(id: course_ids).joins(:shixun_homework_commons)
+    courses = Course.where(id: course_ids).joins(:shixun_homework_commons).where('homework_commons.publish_time < now()')
     @courses = courses.select('courses.id, courses.name, courses.members_count, count(*) shixun_homework_count')
                 .group('courses.id').order('shixun_homework_count desc')
 
diff --git a/app/views/competition_teams/show.html.erb b/app/views/competition_teams/show.html.erb
index 31937688..bc176c1e 100644
--- a/app/views/competition_teams/show.html.erb
+++ b/app/views/competition_teams/show.html.erb
@@ -82,7 +82,9 @@
       <tr>
         <td width="10%"><%= course.teachers.where(user_id: @team_user_ids).first.user.show_real_name %></td>
         <td width="40%" class="edu-txt-left">
-          <span class="task-hide fl" style="max-width: 480px;"><%= course.name %></span>
+          <%= link_to course_path(course), target: '_blank' do %>
+            <span class="task-hide fl" style="max-width: 480px;"><%= course.name %></span>
+          <% end %>
         </td>
         <td width="10%"><%= course.members_count %></td>
         <td width="15%"><%= course['shixun_homework_count'].presence || '--' %></td>
diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index 4017f82b..b6790839 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -46,7 +46,7 @@
               <a href="<%= charts_competition_path(@competition) %>" >排行榜</a>
             </li>
           <% when '报名' %>
-            <li class="<%= params[:action] == 'enroll' || params[:action] == 'show' ? 'active' : '' %>">
+            <li class="<%= params[:action] == 'enroll' || (params[:controller] == 'competition_teams' && params[:action] == 'show') ? 'active' : '' %>">
               <a href="<%= enroll_competition_path(@competition) %>">报名</a>
             </li>
           <% else %>