From 9323cbf3555f5c793b7519975fb42b93e9f95fa2 Mon Sep 17 00:00:00 2001 From: Mohammed Taha Khan Date: Thu, 12 Nov 2026 15:01:44 +0100 Subject: [PATCH] fix(ep): hide request link without read permission --- .../js/components/record_details/CommitteeApproval.js | 9 +++++++-- site/cds_rdm/requests/committee_approval_state.py | 10 +++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/assets/js/components/record_details/CommitteeApproval.js b/assets/js/components/record_details/CommitteeApproval.js index 638a11cd..41700038 100644 --- a/assets/js/components/record_details/CommitteeApproval.js +++ b/assets/js/components/record_details/CommitteeApproval.js @@ -147,9 +147,14 @@ export class CommitteeApprovalManageSection extends Component { const step2Disabled = !isPending && !step2Completed; // Step 3 — Create final public version - const step3Completed = step2Completed && !canCreatePublic; + // Completed only when a public record actually exists. Do not treat + // !canCreatePublic as completed (record owners cannot create public). + const hasPublicRecord = !!( + publicRecordId || committeeApprovalField?.approved_public_version + ); + const step3Completed = hasPublicRecord; const step3Active = step2Completed && canCreatePublic; - const step3Disabled = !step2Completed; + const step3Disabled = !step2Completed || (!hasPublicRecord && !canCreatePublic); return ( diff --git a/site/cds_rdm/requests/committee_approval_state.py b/site/cds_rdm/requests/committee_approval_state.py index 76a966d9..ca1f8651 100644 --- a/site/cds_rdm/requests/committee_approval_state.py +++ b/site/cds_rdm/requests/committee_approval_state.py @@ -88,9 +88,17 @@ def _get_open_request(record_id, parent_record=None): if not hits: return None req = hits[0] + status = req.get("status") + # Status is needed for the workflow timeline for every viewer, but the + # request link must only be exposed when the current user can read it. + request_record = current_requests_service.record_cls.get_record(req["id"]) + if not current_requests_service.check_permission( + g.identity, "read", request=request_record + ): + return {"status": status} return { "id": req["id"], - "status": req.get("status"), + "status": status, "links": req.get("links", {}), } except Exception: