Download as
Browse Code »

Commit e8c3009c1651db507c6c6bfe5fd0cf27a7b30e3f

Authored by Rafael Manzo
Committed by Eduardo Silva Araújo
1 parent 07a0cfd3
Exists in colab

Revert "[Colab] Optional subdirectory route" 

This reverts commit 5a337d1a3abfc8f9d789ec8efd6e41575a416f54.

The right way to set the subdirectory is by setting the Rack mount on config.ru
or on the webserver like apache or nginx.
Showing 2 changed files with 4 additions and 14 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @e8c3009
@@ -16,25 +16,17 @@ class ApplicationController < ActionController::Base @@ -16,25 +16,17 @@ class ApplicationController < ActionController::Base
16 class << self 16 class << self
17 # This is necessary for correct devise routing with locales: https://github.com/plataformatec/devise/wiki/How-To:--Redirect-with-locale-after-authentication-failure 17 # This is necessary for correct devise routing with locales: https://github.com/plataformatec/devise/wiki/How-To:--Redirect-with-locale-after-authentication-failure
18 def default_url_options 18 def default_url_options
19 - default = {}  
20 - default.merge!(locale_options)  
21 - default.merge!(subdirectory_options) 19 + locale_options
22 end 20 end
23 21
24 def locale_options 22 def locale_options
25 { locale: I18n.locale } 23 { locale: I18n.locale }
26 end 24 end
27 -  
28 - def subdirectory_options  
29 - { subdirectory: 'mezuro' }  
30 - end  
31 end 25 end
32 26
33 # This happens after the *_url *_path helpers 27 # This happens after the *_url *_path helpers
34 def default_url_options 28 def default_url_options
35 - default = {}  
36 - default.merge!(self.class.locale_options)  
37 - default.merge!(self.class.subdirectory_options) 29 + self.class.locale_options
38 end 30 end
39 31
40 protected 32 protected
config/routes.rb
  Diff comments   View file @e8c3009
1 Rails.application.routes.draw do 1 Rails.application.routes.draw do
2 - scope "/(:subdirectory)", subdirectory: /mezuro/ do 2 + scope "mezuro" do
3 scope "(:locale)", locale: /en|pt/ do 3 scope "(:locale)", locale: /en|pt/ do
4 # We need to manually define OmniAuth routes since the automatic generation does not support the dynamic scope 4 # We need to manually define OmniAuth routes since the automatic generation does not support the dynamic scope
5 devise_for :users, skip: :omniauth_callbacks 5 devise_for :users, skip: :omniauth_callbacks
@@ -43,10 +43,8 @@ Rails.application.routes.draw do @@ -43,10 +43,8 @@ Rails.application.routes.draw do
43 post '/modules/:id/metric_history' => 'modules#metric_history', as: 'module_metric_history' 43 post '/modules/:id/metric_history' => 'modules#metric_history', as: 'module_metric_history'
44 post '/modules/:id/tree' => 'modules#load_module_tree', as: 'module_tree' 44 post '/modules/:id/tree' => 'modules#load_module_tree', as: 'module_tree'
45 45
46 - root "home#index", as: 'locale_root' 46 + root "home#index"
47 end 47 end
48 -  
49 - root "home#index"  
50 end 48 end
51 49
52 # See comment above for devise_for 50 # See comment above for devise_for