Skip to content

fix: perm change #1903

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

Merged
JackScanlon merged 1 commit into from
Nov 10, 2025
Merged

fix: perm change #1903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CodeListLibrary_project/clinicalcode/entity_utils/permission_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,13 +1041,15 @@ def get_accessible_entities(
from public.clinicalcode_historicalgenericentity as hist_entity
join public.clinicalcode_genericentity as live_entity
on hist_entity.id = live_entity.id
join public.clinicalcode_publishedgenericentity as pub_entity
on pub_entity.entity_id = hist_entity.id and pub_entity.entity_history_id = hist_entity.history_id
join public.clinicalcode_historicaltemplate as hist_tmpl
on hist_entity.template_id = hist_tmpl.id and hist_entity.template_version = hist_tmpl.template_version
join public.clinicalcode_template as live_tmpl
on hist_tmpl.id = live_tmpl.id
where (live_entity.is_deleted is null or live_entity.is_deleted = false)
and (hist_entity.is_deleted is null or hist_entity.is_deleted = false)
and hist_entity.publish_status = {APPROVAL_STATUS.APPROVED.value}
and pub_entity.approval_status = {APPROVAL_STATUS.APPROVED.value}
{brand_clause}
{pk_clause}
) as t0
Expand Down Expand Up @@ -1516,10 +1518,8 @@ def get_accessible_detail_entity(request, entity_id, entity_history_id=None):
is_editable = False
is_org_accessible = False

pub_ent = None
if historical_entity.publish_status == APPROVAL_STATUS.APPROVED.value:
pub_ent = PublishedGenericEntity.objects.filter(entity_id=entity_id, entity_history_id=entity_history_id)
pub_ent = pub_ent.first() if pub_ent.exists() and pub_ent.first().approval_status == APPROVAL_STATUS.APPROVED.value else None
pub_ent = PublishedGenericEntity.objects.filter(entity_id=entity_id, entity_history_id=entity_history_id)
pub_ent = pub_ent.first() if pub_ent.exists() and pub_ent.first().approval_status == APPROVAL_STATUS.APPROVED.value else None

is_published = pub_ent is not None

Expand Down
Loading