adds managed user to session
This commit is contained in:
@@ -13,4 +13,12 @@ class Management::BaseController < ActionController::Base
|
|||||||
@current_manager ||= Manager.find(session["manager_id"]) if session["manager_id"]
|
@current_manager ||= Manager.find(session["manager_id"]) if session["manager_id"]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def current_user
|
||||||
|
@current_user ||= User.find(session["managed_user_id"]) if session["managed_user_id"]
|
||||||
|
end
|
||||||
|
|
||||||
|
def set_managed_user(user)
|
||||||
|
session["managed_user_id"] = user.id
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ class Management::DocumentVerificationsController < Management::BaseController
|
|||||||
|
|
||||||
if @document_verification.valid?
|
if @document_verification.valid?
|
||||||
if @document_verification.verified?
|
if @document_verification.verified?
|
||||||
|
set_managed_user(@document_verification.user)
|
||||||
render :verified
|
render :verified
|
||||||
elsif @document_verification.user?
|
elsif @document_verification.user?
|
||||||
render :new
|
render :new
|
||||||
@@ -25,6 +26,7 @@ class Management::DocumentVerificationsController < Management::BaseController
|
|||||||
def create
|
def create
|
||||||
@document_verification = Verification::Management::Document.new(document_verification_params)
|
@document_verification = Verification::Management::Document.new(document_verification_params)
|
||||||
@document_verification.verify
|
@document_verification.verify
|
||||||
|
set_managed_user(@document_verification.user)
|
||||||
render :verified
|
render :verified
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ class Management::EmailVerificationsController < Management::BaseController
|
|||||||
@email_verification = Verification::Management::Email.new(email_verification_params)
|
@email_verification = Verification::Management::Email.new(email_verification_params)
|
||||||
|
|
||||||
if @email_verification.save
|
if @email_verification.save
|
||||||
|
set_managed_user(@email_verification.user)
|
||||||
render :sent
|
render :sent
|
||||||
else
|
else
|
||||||
render :new
|
render :new
|
||||||
|
|||||||
@@ -28,12 +28,6 @@ class Management::ProposalsController < Management::BaseController
|
|||||||
params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key)
|
params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key)
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_user
|
|
||||||
#CHANGE ME
|
|
||||||
#Should be user being managed
|
|
||||||
User.last
|
|
||||||
end
|
|
||||||
|
|
||||||
def resource_model
|
def resource_model
|
||||||
Proposal
|
Proposal
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ class Management::UsersController < Management::BaseController
|
|||||||
@user.verified_at = Time.now
|
@user.verified_at = Time.now
|
||||||
|
|
||||||
if @user.save then
|
if @user.save then
|
||||||
|
set_managed_user(@user)
|
||||||
render :show
|
render :show
|
||||||
else
|
else
|
||||||
render :new
|
render :new
|
||||||
|
|||||||
@@ -15,10 +15,13 @@ class Verification::Email
|
|||||||
return false unless valid?
|
return false unless valid?
|
||||||
|
|
||||||
generate_token
|
generate_token
|
||||||
user = User.where(document_number: verified_user.document_number).first
|
|
||||||
user.update(email_verification_token: @plain_token)
|
user.update(email_verification_token: @plain_token)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def user
|
||||||
|
User.where(document_number: verified_user.document_number).first
|
||||||
|
end
|
||||||
|
|
||||||
def generate_token
|
def generate_token
|
||||||
@plain_token, @encrypted_token = Devise.token_generator.generate(User, :email_verification_token)
|
@plain_token, @encrypted_token = Devise.token_generator.generate(User, :email_verification_token)
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user