Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions assets/js/components/record_details/CommitteeApproval.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<Grid.Column className="pb-20 pt-0">
Expand Down
10 changes: 9 additions & 1 deletion site/cds_rdm/requests/committee_approval_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading