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 1/2] 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 != "资料下载" %>

From c90379883da68c8ea0f3de7426d4a919010a43c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 15 Jul 2019 17:57:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/educoder/edu-main.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 011095c3..18fc832e 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -579,9 +579,9 @@ a.user_greybg_btn{background-color:#747A7F;color: #fff;}
 .new_li ol li{ list-style-type: decimal!important; }
 .new_li li{ margin-bottom: 0!important; }
 .markdown-toc .markdown-toc-list li{
-    list-style-type: disc!important;
-    list-style-type: decimal!important;
-    margin-bottom: 0!important;
+    /*list-style-type: disc!important;*/
+    /*list-style-type: decimal!important;*/
+    /*margin-bottom: 0!important;*/
 }
 /*搜索框*/
 #pollingPanel{position: relative;width: 248px;height: 32px;}