Makes welcome screen work using a sessions controller

This commit is contained in:
kikito
2015-09-10 17:41:37 +02:00
parent 01acc84679
commit 249aed42c4
3 changed files with 17 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
class Users::SessionsController < Devise::SessionsController
def after_sign_in_path_for(resource)
if resource.show_welcome_screen?
welcome_path
else
root_path
end
end
end

View File

@@ -135,4 +135,8 @@ class User < ActiveRecord::Base
!!(unconfirmed_email && unconfirmed_email !~ OMNIAUTH_EMAIL_REGEX)
end
def show_welcome_screen?
sign_in_count == 1 && unverified? && !organization
end
end

View File

@@ -1,6 +1,7 @@
Rails.application.routes.draw do
devise_for :users, controllers: {
registrations: 'users/registrations',
sessions: 'users/sessions',
omniauth_callbacks: 'users/omniauth_callbacks'
}
devise_for :organizations, class_name: 'User',
@@ -27,6 +28,7 @@ Rails.application.routes.draw do
root 'welcome#index'
get '/welcome', to: 'welcome#welcome'
resources :debates do
member do
post :vote