Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SJ - Fix for admin access rights [#156556008] #1295

Merged
merged 2 commits into from
Apr 9, 2018
Merged

SJ - Fix for admin access rights [#156556008] #1295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c1dd68
fix for admin access rights [#156556008]
Stuart-Johnson Apr 9, 2018
4c40a1b
another take on fixing the admin rights [#156556008]
Stuart-Johnson Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions app/models/protocol.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,24 +235,27 @@ def unique_rm_id_to_protocol
scope :for_admin, -> (identity_id) {
# returns protocols with ssrs in orgs authorized for identity
return nil if identity_id == '0'
service_provider_ssrs = SubServiceRequest.where.not(status: 'first_draft').where(organization_id: Organization.authorized_for_service_provider(identity_id))

if SuperUser.where(identity_id: identity_id).any?
self.for_super_user(identity_id)
self.for_super_user(identity_id, service_provider_ssrs)
else
ssrs = SubServiceRequest.where.not(status: 'first_draft').where(organization_id: Organization.authorized_for_service_provider(identity_id))
joins(:sub_service_requests).merge(ssrs).distinct
joins(:sub_service_requests).merge(service_provider_ssrs).distinct
end
}

scope :for_super_user, -> (identity_id) {
scope :for_super_user, -> (identity_id, service_provider_ssrs = nil) {
# returns protocols with ssrs in orgs authorized for identity
ssrs = SubServiceRequest.where.not(status: 'first_draft').where(organization_id: Organization.authorized_for_super_user(identity_id))

empty_protocol_ids = includes(:sub_service_requests).where(sub_service_requests: { id: nil }).ids
protocol_ids = ssrs.distinct.pluck(:protocol_id)
all_protocol_ids = (protocol_ids + empty_protocol_ids).uniq
all_protocol_ids = protocol_ids + empty_protocol_ids
if service_provider_ssrs
all_protocol_ids << service_provider_ssrs.distinct.pluck(:protocol_id)
end

where(id: all_protocol_ids)
where(id: all_protocol_ids.uniq)
}

scope :show_archived, -> (boolean) {
Expand Down