refactors managed user info into management layout
This commit is contained in:
@@ -14,11 +14,7 @@ class Management::BaseController < ActionController::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
def current_user
|
def current_user
|
||||||
@current_user ||= User.find(session["managed_user_id"]) if session["managed_user_id"]
|
@current_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number])
|
||||||
end
|
|
||||||
|
|
||||||
def set_managed_user(user)
|
|
||||||
session["managed_user_id"] = user.id
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
class Management::DocumentVerificationsController < Management::BaseController
|
class Management::DocumentVerificationsController < Management::BaseController
|
||||||
|
|
||||||
|
before_action :set_document, only: :check
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@document_verification = Verification::Management::Document.new()
|
@document_verification = Verification::Management::Document.new()
|
||||||
end
|
end
|
||||||
@@ -9,7 +11,6 @@ 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
|
||||||
@@ -26,7 +27,6 @@ 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
|
||||||
|
|
||||||
@@ -36,4 +36,9 @@ class Management::DocumentVerificationsController < Management::BaseController
|
|||||||
params.require(:document_verification).permit(:document_type, :document_number)
|
params.require(:document_verification).permit(:document_type, :document_number)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def set_document
|
||||||
|
session[:document_type] = params[:document_verification][:document_type]
|
||||||
|
session[:document_number] = params[:document_verification][:document_number]
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
@@ -8,7 +8,6 @@ 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
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ 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
|
||||||
|
|||||||
12
app/models/verification/management/managed_user.rb
Normal file
12
app/models/verification/management/managed_user.rb
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
class Verification::Management::ManagedUser
|
||||||
|
include ActiveModel::Model
|
||||||
|
|
||||||
|
attr_accessor :user
|
||||||
|
|
||||||
|
def self.find(document_type, document_number)
|
||||||
|
User.where('document_number is not null').
|
||||||
|
find_or_initialize_by(document_type: document_type,
|
||||||
|
document_number: document_number)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
@@ -42,6 +42,10 @@
|
|||||||
<%= render "/management/menu" %>
|
<%= render "/management/menu" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<section class="top-bar-section">
|
||||||
|
<%= render "management/account_info" %>
|
||||||
|
</section>
|
||||||
|
|
||||||
<div class="admin-content small-12 medium-9 column">
|
<div class="admin-content small-12 medium-9 column">
|
||||||
<% if notice %>
|
<% if notice %>
|
||||||
<div data-alert class="alert-box radius success">
|
<div data-alert class="alert-box radius success">
|
||||||
|
|||||||
@@ -1,23 +1,25 @@
|
|||||||
<p class="account-info">
|
<% if current_user.document_number.present? %>
|
||||||
<% if current_user %>
|
<span class="account-info right">
|
||||||
<%= t("management.account_info.managed_user_title") %>
|
<% if current_user.level_two_or_three_verified? %>
|
||||||
|
<%= t("management.account_info.identified_label") %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if account.username.present? %>
|
<% if current_user.username.present? %>
|
||||||
<%= t("management.username_label") %>
|
<%= t("management.account_info.username_label") %>
|
||||||
<strong><%= account.username %></strong>
|
<strong><%= current_user.username %></strong>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if account.email.present? %>
|
<% if current_user.email.present? %>
|
||||||
<%= t("management.email_label") %>
|
<%= t("management.account_info.email_label") %>
|
||||||
<strong><%= account.email %></strong>
|
<strong><%= current_user.email %></strong>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= t("management.document_type_label") %>
|
<%= t("management.account_info.document_type_label") %>
|
||||||
<strong><%= humanize_document_type(account.document_type) %></strong>
|
<strong><%= humanize_document_type(current_user.document_type) %></strong>
|
||||||
|
|
||||||
<%= t("management.document_number") %>
|
<%= t("management.account_info.document_number_label") %>
|
||||||
<strong><%= account.document_number %></strong>
|
<strong><%= current_user.document_number %></strong>
|
||||||
|
|
||||||
<%= link_to(t("management.account_info.logout"), management_session_path, method: :delete) %>
|
<%= link_to(t("management.account_info.logout"), logout_management_users_path, method: :delete) %>
|
||||||
</p>
|
</span>
|
||||||
|
<% end %>
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<%= render 'management/account_info.html', account: @document_verification %>
|
|
||||||
|
|
||||||
<div class="alert-box alert radius">
|
<div class="alert-box alert radius">
|
||||||
<%= t("management.document_verifications.not_in_census") %>
|
<%= t("management.document_verifications.not_in_census") %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<%= render 'management/account_info.html', account: @document_verification %>
|
|
||||||
|
|
||||||
<div class="alert-box success radius">
|
<div class="alert-box success radius">
|
||||||
<%= t("management.document_verifications.please_check_account_data") %>
|
<%= t("management.document_verifications.please_check_account_data") %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<%= render 'management/account_info.html', account: @document_verification %>
|
|
||||||
|
|
||||||
<div class="alert-box success radius">
|
<div class="alert-box success radius">
|
||||||
<%= t("management.document_verifications.already_verified") %>
|
<%= t("management.document_verifications.already_verified") %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<%= render 'management/account_info.html', account: @email_verification %>
|
|
||||||
|
|
||||||
<div class="alert-box success radius">
|
<div class="alert-box success radius">
|
||||||
<%= t("management.email_verifications.document_found_in_census") %>
|
<%= t("management.email_verifications.document_found_in_census") %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<%= render 'management/account_info.html', account: @email_verification %>
|
|
||||||
|
|
||||||
<div class="alert-box success radius">
|
<div class="alert-box success radius">
|
||||||
<%= t("management.email_verifications.email_sent_instructions") %>
|
<%= t("management.email_verifications.email_sent_instructions") %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<%= render 'management/account_info.html', account: current_user %>
|
|
||||||
|
|
||||||
<section role="main">
|
<section role="main">
|
||||||
<%= render 'admin/shared/proposal_search', url: management_proposals_path %>
|
<%= render 'admin/shared/proposal_search', url: management_proposals_path %>
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<%= render 'management/account_info.html', account: @user %>
|
|
||||||
|
|
||||||
<p><%= t("management.users.create_user_info") %></p>
|
<p><%= t("management.users.create_user_info") %></p>
|
||||||
|
|
||||||
<%= render 'management/user_permissions',
|
<%= render 'management/user_permissions',
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
<%= render 'management/account_info.html', account: @user %>
|
|
||||||
|
|
||||||
<p><%= t("management.users.create_user_success_html", email: @user.email) %></p>
|
<p><%= t("management.users.create_user_success_html", email: @user.email) %></p>
|
||||||
|
|
||||||
<%= render 'management/user_permissions',
|
<%= render 'management/user_permissions',
|
||||||
|
|||||||
Reference in New Issue
Block a user