diff --git a/app/assets/javascripts/Jit/jit2.0.0.js b/app/assets/javascripts/Jit/jit2.0.0.js index 7a078b96..1ce1ba4a 100644 --- a/app/assets/javascripts/Jit/jit2.0.0.js +++ b/app/assets/javascripts/Jit/jit2.0.0.js @@ -8321,7 +8321,7 @@ Layouts.ForceDirected = new Class({ if(incremental) { (function iter() { for(var total=incremental.iter, j=0; j= times) { incremental.onComplete(); diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e4f3e19c..ef25a477 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -15,14 +15,6 @@ class ApplicationController < ActionController::Base session[:previous_url] = request.fullpath end end - - def after_sign_in_path_for(resource) - session[:previous_url] || root_path - end - - def after_sign_up_path_for(resource) - root_path - end private diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb new file mode 100644 index 00000000..7062ead0 --- /dev/null +++ b/app/controllers/registrations_controller.rb @@ -0,0 +1,12 @@ +class RegistrationsController < Devise::RegistrationsController + protected + + def after_sign_in_path_for(resource) + session[:previous_url] || root_path + end + + def after_sign_up_path_for(resource) + root_path + end + +end diff --git a/config/routes.rb b/config/routes.rb index bb8aaaec..58e1d0fc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -33,12 +33,12 @@ ISSAD::Application.routes.draw do match 'maps/:id/embed', to: 'maps#embed', via: :get, as: :embed match 'maps/:id/:format', to: 'maps#json', via: :get, as: :json - devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout' } + devise_for :users, :controllers => { :registrations => "registrations" }, :path_names => { :sign_in => 'login', :sign_out => 'logout' } devise_scope :user do get "sign_out", :to => "devise/sessions#destroy" end - resources :users, except: :show + resources :users, except: [:show, :index] resources :mappings