From fad17804001546084c37e503113d94f386fadf04 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 15 Jul 2019 17:25:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/competitions/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/competitions/show.html.erb b/app/views/competitions/show.html.erb
index 28200db3..d74b1436 100644
--- a/app/views/competitions/show.html.erb
+++ b/app/views/competitions/show.html.erb
@@ -1,7 +1,7 @@
 <div id="competition-content">
   <% if @competition.identifier == "hn" %>
     <%= render :partial => "hn_competition" %>
-  <% elsif @competition.identifier == "ccf-se-2018" %>
+  <% elsif @competition.identifier == "ccf-se-2018" || competition.identifier == "ccf-se-2019" %>
     <%= render :partial => "ccf_competition" %>
   <% elsif @competition.identifier == "gcc-dev-2018" %>
       <%= render :partial => "qg_competition" %>

From 11bcc51317d81e22a2ebf1bc33a46f7f0deb4454 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 15 Jul 2019 17:27:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/competitions/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/competitions/show.html.erb b/app/views/competitions/show.html.erb
index d74b1436..82a6b426 100644
--- a/app/views/competitions/show.html.erb
+++ b/app/views/competitions/show.html.erb
@@ -1,7 +1,7 @@
 <div id="competition-content">
   <% if @competition.identifier == "hn" %>
     <%= render :partial => "hn_competition" %>
-  <% elsif @competition.identifier == "ccf-se-2018" || competition.identifier == "ccf-se-2019" %>
+  <% elsif @competition.identifier == "ccf-se-2018" || @competition.identifier == "ccf-se-2019" %>
     <%= render :partial => "ccf_competition" %>
   <% elsif @competition.identifier == "gcc-dev-2018" %>
       <%= render :partial => "qg_competition" %>

From 3a65e662eb1584a3a0a1c79582895bbc1e708ba4 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Mon, 15 Jul 2019 17:48:56 +0800
Subject: [PATCH 3/3] fix competition setting

---
 app/controllers/competitions_controller.rb            | 2 +-
 app/views/managements/_competition_list_page.html.erb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/competitions_controller.rb b/app/controllers/competitions_controller.rb
index 86ea9e08..e73c779a 100644
--- a/app/controllers/competitions_controller.rb
+++ b/app/controllers/competitions_controller.rb
@@ -487,7 +487,7 @@ class CompetitionsController < ApplicationController
 
       if params[:competition_module]
         @competition.competition_modules.where(:id => params[:competition_module], :md_edit => false).update_all(:hidden => 0)
-        none_modules = @competition.competition_modules.where("name != '首页' and md_edit = false").map(&:id).join(",").split(",") - params[:competition_module]
+        none_modules = @competition.competition_modules.where("name != '首页' and md_edit = false").pluck(:id) - params[:competition_module].map(&:to_i)
         @competition.competition_modules.where(:id => none_modules).update_all(:hidden => 1)
       end
       if params[:name]
diff --git a/app/views/managements/_competition_list_page.html.erb b/app/views/managements/_competition_list_page.html.erb
index e5f2d6a5..e65139e9 100644
--- a/app/views/managements/_competition_list_page.html.erb
+++ b/app/views/managements/_competition_list_page.html.erb
@@ -46,6 +46,10 @@
             <% else %>
               <li class="clearfix<%= com_module.name == "通知公告" ? " noticeLi" : "" %>">
                 <div class="fl">
+                  <% if com_module.name == "首页" %> <!-- disabled导致competition_module为空 -->
+                    <input type="hidden" name="competition_module[]" value="<%= com_module.id %>" />
+                  <% end %>
+
                   <input type="checkbox" value="<%= com_module.id %>" name="competition_module[]" <%= com_module.hidden ? "" : "checked" %> <%= com_module.name == "首页" ? "disabled" : "" %> class="magic-checkbox" id="com_module_<%= com_module.id %>">
                   <label for="com_module_<%= com_module.id %>" style="top:0px">
                     <% if com_module.name != "首页" && com_module.name != "报名" && com_module.name != "通知公告" && com_module.name != "排行榜" && com_module.name != "资料下载" %>