diff --git a/app/controllers/management/base_controller.rb b/app/controllers/management/base_controller.rb index f01bbebbc..f7a9c2214 100644 --- a/app/controllers/management/base_controller.rb +++ b/app/controllers/management/base_controller.rb @@ -16,16 +16,16 @@ class Management::BaseController < ActionController::Base session[:manager] end - def managed_user - @managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number]) - end - def current_user managed_user end + def managed_user + @managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number]) + end + def check_verified_user(alert_msg) - unless current_user.level_two_or_three_verified? + unless managed_user.level_two_or_three_verified? redirect_to management_document_verifications_path, alert: alert_msg end end diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb index 3f4284a06..a1d0ed439 100644 --- a/app/controllers/management/proposals_controller.rb +++ b/app/controllers/management/proposals_controller.rb @@ -17,7 +17,7 @@ class Management::ProposalsController < Management::BaseController end def vote - @proposal.register_vote(current_user, 'yes') + @proposal.register_vote(managed_user, 'yes') set_proposal_votes(@proposal) end @@ -44,14 +44,12 @@ class Management::ProposalsController < Management::BaseController check_verified_user t("management.proposals.alert.unverified_user") end - ### Duplicated in application_controller. Move to a concern. def set_proposal_votes(proposals) - @proposal_votes = current_user ? current_user.proposal_votes(proposals) : {} + @proposal_votes = managed_user ? managed_user.proposal_votes(proposals) : {} end def set_comment_flags(comments) - @comment_flags = current_user ? current_user.comment_flags(comments) : {} + @comment_flags = managed_user ? managed_user.comment_flags(comments) : {} end - ### end diff --git a/app/controllers/management/spending_proposals_controller.rb b/app/controllers/management/spending_proposals_controller.rb index 49378ca63..b505d0901 100644 --- a/app/controllers/management/spending_proposals_controller.rb +++ b/app/controllers/management/spending_proposals_controller.rb @@ -28,7 +28,7 @@ class Management::SpendingProposalsController < Management::BaseController end def vote - @spending_proposal.register_vote(current_user, 'yes') + @spending_proposal.register_vote(managed_user, 'yes') set_spending_proposal_votes(@spending_proposal) end @@ -54,7 +54,7 @@ class Management::SpendingProposalsController < Management::BaseController # This should not be necessary. Maybe we could create a specific show view for managers. def set_spending_proposal_votes(spending_proposals) - @spending_proposal_votes = current_user ? current_user.spending_proposal_votes(spending_proposals) : {} + @spending_proposal_votes = managed_user ? managed_user.spending_proposal_votes(spending_proposals) : {} end def set_geozone_name