Merge pull request #641 from AyuntamientoMadrid/management-polishing
Management polishing
This commit is contained in:
@@ -2,6 +2,7 @@ class Management::BaseController < ActionController::Base
|
||||
layout 'management'
|
||||
|
||||
before_action :verify_manager
|
||||
before_action :set_locale
|
||||
|
||||
helper_method :managed_user
|
||||
|
||||
@@ -12,11 +13,21 @@ class Management::BaseController < ActionController::Base
|
||||
end
|
||||
|
||||
def current_manager
|
||||
session["manager"]
|
||||
session[:manager]
|
||||
end
|
||||
|
||||
def managed_user
|
||||
@managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number])
|
||||
end
|
||||
|
||||
def set_locale
|
||||
if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
|
||||
session[:locale] = params[:locale]
|
||||
end
|
||||
|
||||
session[:locale] ||= I18n.default_locale
|
||||
|
||||
I18n.locale = session[:locale]
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -5,7 +5,7 @@ class Management::SessionsController < ActionController::Base
|
||||
def create
|
||||
destroy_session
|
||||
if manager = ManagerAuthenticator.new(params).auth
|
||||
session["manager"] = manager
|
||||
session[:manager] = manager
|
||||
redirect_to management_root_path
|
||||
else
|
||||
raise ActionController::RoutingError.new('Not Found')
|
||||
@@ -20,7 +20,9 @@ class Management::SessionsController < ActionController::Base
|
||||
private
|
||||
|
||||
def destroy_session
|
||||
session["manager"] = nil
|
||||
session[:manager] = nil
|
||||
session[:document_type] = nil
|
||||
session[:document_number] = nil
|
||||
end
|
||||
|
||||
end
|
||||
@@ -30,7 +30,7 @@ class Management::UsersController < Management::BaseController
|
||||
end
|
||||
|
||||
def destroy_session
|
||||
session[:document_type] = nil
|
||||
session[:document_type] = nil
|
||||
session[:document_number] = nil
|
||||
end
|
||||
|
||||
|
||||
@@ -22,10 +22,7 @@ class Verification::EmailController < ApplicationController
|
||||
@email.encrypted_token,
|
||||
@verified_user.document_type,
|
||||
@verified_user.document_number).deliver_later
|
||||
###CHANGE ME
|
||||
#we should not have access to the account_page of a managed_user
|
||||
redirect_to account_path, notice: t('verification.email.create.flash.success', email: @verified_user.email)
|
||||
###
|
||||
else
|
||||
redirect_to verified_user_path, alert: t('verification.email.create.alert.failure')
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user