Merge branch 'educoder' into develop

dev_bj
p31729568 5 years ago
commit 84a4201231

@ -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? %>

@ -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)

Loading…
Cancel
Save