diff --git a/app/controllers/management/base_controller.rb b/app/controllers/management/base_controller.rb index 88ceb2839..7d6c89b5f 100644 --- a/app/controllers/management/base_controller.rb +++ b/app/controllers/management/base_controller.rb @@ -3,6 +3,8 @@ class Management::BaseController < ActionController::Base before_action :verify_manager + helper_method :managed_user + private def verify_manager @@ -13,8 +15,8 @@ class Management::BaseController < ActionController::Base @current_manager ||= Manager.find(session["manager_id"]) if session["manager_id"] end - def current_user - @current_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number]) + def managed_user + @managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number]) end end diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb index 84ea43afa..d941b437a 100644 --- a/app/controllers/management/proposals_controller.rb +++ b/app/controllers/management/proposals_controller.rb @@ -38,6 +38,10 @@ class Management::ProposalsController < Management::BaseController end end + def current_user + managed_user + end + #Duplicated in application_controller. Move to a concenrn. def set_proposal_votes(proposals) @proposal_votes = current_user ? current_user.proposal_votes(proposals) : {} diff --git a/app/views/management/_account_info.html.erb b/app/views/management/_account_info.html.erb index 7941156f1..77bb81e5d 100644 --- a/app/views/management/_account_info.html.erb +++ b/app/views/management/_account_info.html.erb @@ -1,24 +1,24 @@ -<% if current_user.document_number.present? %> +<% if managed_user.document_number.present? %> - <% if current_user.level_two_or_three_verified? %> + <% if managed_user.level_two_or_three_verified? %> <%= t("management.account_info.identified_label") %> <% end %> - <% if current_user.username.present? %> + <% if managed_user.username.present? %> <%= t("management.account_info.username_label") %> - <%= current_user.username %> + <%= managed_user.username %> <% end %> - <% if current_user.email.present? %> + <% if managed_user.email.present? %> <%= t("management.account_info.email_label") %> - <%= current_user.email %> + <%= managed_user.email %> <% end %> <%= t("management.account_info.document_type_label") %> - <%= humanize_document_type(current_user.document_type) %> + <%= humanize_document_type(managed_user.document_type) %> <%= t("management.account_info.document_number_label") %> - <%= current_user.document_number %> + <%= managed_user.document_number %> <%= link_to(t("management.account_info.logout"), logout_management_users_path, method: :delete) %> diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index e139d6973..4dc8294db 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -29,7 +29,7 @@ module CommonActions end def login_managed_user(user) - allow_any_instance_of(Management::BaseController).to receive(:current_user).and_return(user) + allow_any_instance_of(Management::BaseController).to receive(:managed_user).and_return(user) end def confirm_email