Merge remote-tracking branch 'origin/master' into rector/rules-symfony

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue

@@ -329,12 +329,13 @@ export default {
       if (this.action !== 'create') {
          this.loadData();
       } else {
-        console.log('show centers', this.showCenters);
+        // console.log('show centers', this.showCenters);
         getCentersForPersonCreation()
             .then(params => {
-              this.config.centers = params.centers;
+              this.config.centers = params.centers.filter(c => c.isActive);
               this.showCenters = params.showCenters;
-              console.log('show centers inside', this.showCenters);
+              // console.log('centers', this.config.centers)
+              // console.log('show centers inside', this.showCenters);
               if (this.showCenters && this.config.centers.length === 1) {
                 this.person.center = this.config.centers[0];
               }

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig

@@ -4,7 +4,7 @@
     <li><b>{{ 'gender'|trans }}</b>:
         {{ person.gender|trans }}</li>
     <li><b>{{ 'maritalStatus'|trans }}</b>:
-        {% if person.maritalStatus.name %}{{ person.maritalStatus.name|localize_translatable_string }}{% endif %}</li>
+        {% if person.maritalStatus %}{{ person.maritalStatus.name|localize_translatable_string }}{% endif %}</li>
     <li><b>{{ 'birthdate'|trans }}</b>:
         {% if person.birthdate is not null %}{{ person.birthdate|format_date('short') }}{% endif %}</li>
     <li><b>{{ 'placeOfBirth'|trans }}</b>:

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig

@@ -8,9 +8,9 @@
 
 {% block content %}
 <div class="person-duplicate">
-            
+
             <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
-            
+
             {{ form_start(form) }}
             {{ form_rest(form) }}
 
@@ -29,3 +29,11 @@
 
 </div>
 {% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}