From ccfbae76364f5248408ae046181ef9ce46514f11 Mon Sep 17 00:00:00 2001 From: Benn Oshrin Date: Mon, 20 May 2024 13:32:05 -0400 Subject: [PATCH] Additional commit for CFM-169 --- .../Controller/Component/RegistryAuthComponent.php | 13 ++++--------- app/src/Model/Table/JobHistoryRecordsTable.php | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/src/Controller/Component/RegistryAuthComponent.php b/app/src/Controller/Component/RegistryAuthComponent.php index a1646e817..36aa7b4be 100644 --- a/app/src/Controller/Component/RegistryAuthComponent.php +++ b/app/src/Controller/Component/RegistryAuthComponent.php @@ -358,15 +358,10 @@ protected function calculatePermissions(?int $id=null): array { $query = $query->contain($table->$getActionMethod()); } - try { - // Pull the current record - $obj = $query->firstOrFail(); - } - catch(\Exception $e) { - // findById throws Cake\Datasource\Exception\RecordNotFoundException - $this->Flash->error($e->getMessage()); - return $this->generateRedirect(null); - } + // Pull the current record + // This may throw Cake\Datasource\Exception\RecordNotFoundException, + // which we let bubble up + $obj = $query->firstOrFail(); if(method_exists($obj, "isReadOnly")) { $readOnly = $obj->isReadOnly(); diff --git a/app/src/Model/Table/JobHistoryRecordsTable.php b/app/src/Model/Table/JobHistoryRecordsTable.php index 8cecb64d9..e14273306 100644 --- a/app/src/Model/Table/JobHistoryRecordsTable.php +++ b/app/src/Model/Table/JobHistoryRecordsTable.php @@ -79,7 +79,7 @@ public function initialize(array $config): void { $this->setViewContains([ 'People' => ['PrimaryName'], - 'ExternalIdentities' => ['PrimaryName'] + 'ExternalIdentities' => ['Names'] ]); $this->setPermissions([