Prevent deprecated calls

diff --git a/galette/lib/Galette/Entity/Adherent.php b/galette/lib/Galette/Entity/Adherent.php
index d9db06f6e4dbfb3cf10856dde35771410c266f92..dd58302caae1565e5644679e476b7870be62072b 100644 (file)
--- a/galette/lib/Galette/Entity/Adherent.php
+++ b/galette/lib/Galette/Entity/Adherent.php
@@ -1734,21 +1734,21 @@ class Adherent
             }
             switch ($name) {
                 case 'sadmin':
+                    return (($this->isAdmin()) ? _T("Yes") : _T("No"));
                 case 'sdue_free':
+                    return (($this->isDueFree()) ? _T("Yes") : _T("No"));
                 case 'sappears_in_list':
+                    return (($this->appearsInMembersList()) ? _T("Yes") : _T("No"));
                 case 'sstaff':
                     return (($this->$real) ? _T("Yes") : _T("No"));
-                    break;
                 case 'sactive':
-                    return (($this->$real) ? _T("Active") : _T("Inactive"));
-                    break;
+                    return (($this->isActive()) ? _T("Active") : _T("Inactive"));
                 case 'stitle':
                     if (isset($this->_title) && $this->_title instanceof Title) {
                         return $this->_title->tshort;
                     } else {
                         return null;
                     }
-                    break;
                 case 'sstatus':
                     $status = new Status($this->zdb);
                     return $status->getLabel($this->_status);

diff --git a/galette/templates/default/pages/member_show.html.twig b/galette/templates/default/pages/member_show.html.twig
index 08f2666190850440cf3fb8156aeea83415df36b2..99959c26ea1aa113835af94576bfb762cf9d0d27 100644 (file)
--- a/galette/templates/default/pages/member_show.html.twig
+++ b/galette/templates/default/pages/member_show.html.twig
@@ -151,10 +151,6 @@
                 {% if element.field_id == 'parent_id' %}
                     {continue}
                 {% endif %}
-                {% set propname = element.propname %}
-
-                {% set propvalue = attribute(member, propname) %}
-                {% set value = propvalue|escape %}
 
                 {% if element.field_id == 'nom_adh' %}
                     {% set value = member.sfullname %}
@@ -176,6 +172,10 @@
                     {% set value = member.others_infos_admin|escape|nl2br %}
                 {% elseif element.field_id == 'info_public_adh' %}
                     {% set value = member.others_infos|escape|nl2br %}
+                {% else %}
+                    {% set propname = element.propname %}
+                    {% set propvalue = attribute(member, propname) %}
+                    {% set value = propvalue|escape %}
                 {% endif %}
                 {% if loop.first and loop.parent.loop.last and (member.getGroups()|length != 0 or member.getManagedGroups()|length != 0) %}
                             <tr>

diff --git a/galette/templates/default/pages/members_list.html.twig b/galette/templates/default/pages/members_list.html.twig
index 5d24fcc03b7ec41f561e0f270e17f9c92d63a8f3..291da33007df9bf4126e4dcf073583d057ff7d53 100644 (file)
--- a/galette/templates/default/pages/members_list.html.twig
+++ b/galette/templates/default/pages/members_list.html.twig
@@ -344,7 +344,6 @@
         {% else %}
             {% set lrclass = rclass %}
             {% set propname = column.propname %}
-            {% set propvalue = attribute(member, propname) %}
             {% set value = null %}
 
             {% if column.field_id == 'nom_adh' %}
@@ -382,6 +381,7 @@
 
             {# If value has not been set, take the generic value #}
             {% if not value %}
+                {% set propvalue = attribute(member, propname) %}
                 {% if propvalue %}
                     {% set value = propvalue|e('html') %}
                 {% else %}