Additional commit for CFM-169

COmanage · May 20, 2024 · ccfbae7 · ccfbae7
1 parent e57a7fc
commit ccfbae7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git 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
@@ -79,7 +79,7 @@ public function initialize(array $config): void {
 
     $this->setViewContains([
       'People' => ['PrimaryName'],
-      'ExternalIdentities' => ['PrimaryName']
+      'ExternalIdentities' => ['Names']
     ]);
 
     $this->setPermissions([