alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix member frontend routing

This commit is contained in:
manson 2014-07-16 11:02:10 +08:00
parent 2e1680cbac
commit d40a1fae34
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/keyword_constraint.rb
View File

@ -1,6 +1,6 @@
class KeywordConstraint class KeywordConstraint
def matches?(request) def matches?(request)
keywords = %w{admin member desktop user signup login} keywords = %w{admin desktop user signup login}
keywords.all? { |k| !request.url.include?(k) } keywords.all? { |k| !request.url.include?(k) }
end end
end end

12
config/routes.rb
View File

@ -67,11 +67,11 @@ Orbit::Application.routes.draw do
get "/facebook/profile_import" => "facebook#profile_import" get "/facebook/profile_import" => "facebook#profile_import"
resources :passwords resources :passwords
resources :members do # resources :members do
collection do # collection do
get ':name-:uid', to: 'members#show', as: :display # get ':name-:uid', to: 'members#show', as: :display
end # end
end # end
namespace :admin do namespace :admin do
resources :dashboards do resources :dashboards do
@ -230,6 +230,8 @@ Orbit::Application.routes.draw do
get 'mobile/:page(/:page)(/:page)(/:page)', to: 'pages#show', constraints: KeywordConstraint.new get 'mobile/:page(/:page)(/:page)(/:page)', to: 'pages#show', constraints: KeywordConstraint.new
get ':page(/:page)(/:page)(/:page)', to: 'pages#show', constraints: KeywordConstraint.new get ':page(/:page)(/:page)(/:page)', to: 'pages#show', constraints: KeywordConstraint.new
get '(/:page)(/:page)(/:page)/members(/:name-:uid)', to: 'pages#show'
get '(/:page)(/:page)(/:page)/member(/:name-:uid)', to: 'pages#show'
resources :pages resources :pages
end end
# Example of regular route: # Example of regular route: