From cb5fff674b00d641dd3d6f5b5c782e58cf21959d Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Sat, 29 Jun 2019 16:00:40 +0800
Subject: [PATCH 1/2] 500

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

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 0101b2a8..f33b2110 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -18,7 +18,7 @@
           </ul>
         </li>
       <% end %>
-      <li class="<%= params[:controller] == "libraries" ? "active" : "" %>"><%= link_to '文库', libraries_path %></li>
+
       <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
       <% if User.current.ec_school.present? %>

From 82a9e0ac077f09a0efe5ae9143c10dea88e23948 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 29 Jun 2019 16:07:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index ff8d4137..c8ce7945 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2658,13 +2658,13 @@ RedmineApp::Application.routes.draw do ## oauth相关
 
   resource :sso, only: [:show, :create]
 
+  get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id'
+
   # library
   resources :libraries do
     get :publish_success, on: :collection
   end
 
-  get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id'
-
   Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
     file = File.join(plugin_dir, "config/routes.rb")
     if File.exists?(file)