From d40a1fae34e5624b2c9afeb44e71365222b862a6 Mon Sep 17 00:00:00 2001 From: manson Date: Wed, 16 Jul 2014 11:02:10 +0800 Subject: [PATCH] Fix member frontend routing --- config/initializers/keyword_constraint.rb | 2 +- config/routes.rb | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/initializers/keyword_constraint.rb b/config/initializers/keyword_constraint.rb index 41a0b52..55f03b2 100644 --- a/config/initializers/keyword_constraint.rb +++ b/config/initializers/keyword_constraint.rb @@ -1,6 +1,6 @@ class KeywordConstraint 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) } end end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 06c8cf4..3466242 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -67,11 +67,11 @@ Orbit::Application.routes.draw do get "/facebook/profile_import" => "facebook#profile_import" resources :passwords - resources :members do - collection do - get ':name-:uid', to: 'members#show', as: :display - end - end + # resources :members do + # collection do + # get ':name-:uid', to: 'members#show', as: :display + # end + # end namespace :admin 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 ':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 end # Example of regular route: