consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removes use of current_user in management

Browse Source 
favors managed_user
to avoid conflicts with logged admin users
This commit is contained in:
Juanjo Bazán
2016-04-27 13:27:20 +02:00
parent 7f9cf39c41
commit 585f3dd6c7
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/management/base_controller.rb
View File

@@ -16,16 +16,16 @@ class Management::BaseController < ActionController::Base
session[:manager] session[:manager]
end end
def managed_user
@managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number])
end
def current_user def current_user
managed_user managed_user
end end
def managed_user
@managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number])
end
def check_verified_user(alert_msg) 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 redirect_to management_document_verifications_path, alert: alert_msg
end end
end end

8
app/controllers/management/proposals_controller.rb
View File

@@ -17,7 +17,7 @@ class Management::ProposalsController < Management::BaseController
end end
def vote def vote
@proposal.register_vote(current_user, 'yes') @proposal.register_vote(managed_user, 'yes')
set_proposal_votes(@proposal) set_proposal_votes(@proposal)
end end
@@ -44,14 +44,12 @@ class Management::ProposalsController < Management::BaseController
check_verified_user t("management.proposals.alert.unverified_user") check_verified_user t("management.proposals.alert.unverified_user")
end end
### Duplicated in application_controller. Move to a concern.
def set_proposal_votes(proposals) def set_proposal_votes(proposals)
@proposal_votes = current_user ? current_user.proposal_votes(proposals) : {} @proposal_votes = managed_user ? managed_user.proposal_votes(proposals) : {}
end end
def set_comment_flags(comments) 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
###
end end

4
app/controllers/management/spending_proposals_controller.rb
View File

@@ -28,7 +28,7 @@ class Management::SpendingProposalsController < Management::BaseController
end end
def vote def vote
@spending_proposal.register_vote(current_user, 'yes') @spending_proposal.register_vote(managed_user, 'yes')
set_spending_proposal_votes(@spending_proposal) set_spending_proposal_votes(@spending_proposal)
end 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. # This should not be necessary. Maybe we could create a specific show view for managers.
def set_spending_proposal_votes(spending_proposals) 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 end
def set_geozone_name def set_geozone_name