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 @@ <% end %> -
  • "><%= link_to '文库', libraries_path %>
  • +
  • "><%= link_to "竞赛", competitions_path %>
  • "><%= link_to "问答", forums_path %>
  • <% if User.current.ec_school.present? %> diff --git a/config/routes.rb b/config/routes.rb index ff8d4137..af3f2a1f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,7 +26,7 @@ # Example: :via => :get ====> :via => :get RedmineApp::Application.routes.draw do ## oauth相关 - + # zhushi match 'oauth', to: 'oauth#index' match 'oauth/authorize', to: 'oauth#authorize', :via => [:get, :post] match 'oauth/token', to: 'oauth#token', :via => :post @@ -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)