From 7c544151b0b25ef370c12e1771251c55e0c67ae5 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Fri, 27 Sep 2024 12:00:06 +0300
Subject: [PATCH] Fix petition view issue

---
 app/templates/Petitions/fields.inc | 65 ++++++++++++++++--------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/app/templates/Petitions/fields.inc b/app/templates/Petitions/fields.inc
index ecb9c9aa4..6d5df1c3b 100644
--- a/app/templates/Petitions/fields.inc
+++ b/app/templates/Petitions/fields.inc
@@ -42,38 +42,43 @@ print $this->element('form/listItem', [
 ]);
 
 // Enrollee
-$enrolleeStatus = $vv_obj->enrollee_person->primary_name->full_name ?? __d('field', 'Petitions.enrollee.new');
-$enrolleeLink = [
-  'url' => [
-    'controller' => 'people',
-    'action' => 'edit',
-    $vv_obj->enrollee_person_id
-  ]
-];
-print $this->element('form/listItem', [
-  'arguments' => [
-    'fieldName' => 'enrollee_person_id',
-    'status' => $enrolleeStatus,
-    'link' => !empty($vv_obj->enrollee_person->id) ? $enrolleeLink : [],
-  ]
-]);
+if (!empty($vv_obj?->enrollee_person?->id)) {
+  $enrolleeStatus = $vv_obj->enrollee_person->primary_name->full_name ?? __d('field', 'Petitions.enrollee.new');
+  $enrolleeLink = [
+    'url' => [
+      'controller' => 'people',
+      'action' => 'edit',
+      $vv_obj->enrollee_person_id
+    ]
+  ];
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'enrollee_person_id',
+      'status' => $enrolleeStatus,
+      'link' => !empty($vv_obj->enrollee_person->id) ? $enrolleeLink : [],
+    ]
+  ]);
+
+}
 
 // Petitioner
-$petitionerStatus = $vv_obj?->petitioner_person?->primary_name?->full_name ?? '';
-$petitionerLink = [
-  'url' => [
-    'controller' => 'people',
-    'action' => 'edit',
-    $vv_obj->petitioner_person->id
-  ]
-];
-print $this->element('form/listItem', [
-  'arguments' => [
-    'fieldName' => 'petitioner_person_id',
-    'status' => $petitionerStatus,
-    'link' => !empty($vv_obj->petitioner_person->id) ? $petitionerLink : []
-  ]
-]);
+if (!empty($vv_obj?->petitioner_person?->id)) {
+  $petitionerStatus = $vv_obj?->petitioner_person?->primary_name?->full_name ?? '';
+  $petitionerLink = [
+    'url' => [
+      'controller' => 'people',
+      'action' => 'edit',
+      $vv_obj->petitioner_person->id
+    ]
+  ];
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'petitioner_person_id',
+      'status' => $petitionerStatus,
+      'link' => !empty($vv_obj->petitioner_person->id) ? $petitionerLink : []
+    ]
+  ]);
+}
 
 ?>