From c214c2f4a4331c25310f151eae836d7ec8b67ad5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 17:09:10 +0200
Subject: [PATCH] household: safe display of household members without
 positions

---
 .../ChillPersonBundle/Form/HouseholdMemberType.php  | 13 ++++++++-----
 .../views/Person/household_history.html.twig        |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
index 99c698c91..192142043 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
@@ -26,12 +26,15 @@ class HouseholdMemberType extends AbstractType
                 'input' => 'datetime_immutable',
             ]);
 
-        if (!$options['data']->getPosition()->getShareHousehold()) {
-            $builder->add('endDate', ChillDateType::class, [
-                'label' => 'household.End date',
-                'input' => 'datetime_immutable',
-            ]);
+        if (null !== $options['data']->getPosition()) {
+            if (!$options['data']->getPosition()->getShareHousehold()) {
+                $builder->add('endDate', ChillDateType::class, [
+                    'label' => 'household.End date',
+                    'input' => 'datetime_immutable',
+                ]);
+            }
         }
+
         $builder
             ->add('comment', ChillTextareaType::class, [
                 'label' => 'household.Comment',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
index 1ff91de15..6f7ce0a06 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
@@ -48,7 +48,9 @@
                 </div>
                 <div class="wl-col list">
                     <p class="item">
-                        {{ p.position.label|localize_translatable_string }}
+                        {% if p.position %}
+                            {{ p.position.label|localize_translatable_string }}
+                        {% endif %}
                         {% if p.holder %}
                             <span class="fa-stack fa-holder" title="{{ 'houshold.holder'|trans|e('html_attr') }}">
                                 <i class="fa fa-circle fa-stack-1x text-success"></i>