Fix some notices

diff --git a/galette/templates/default/advanced_search.tpl b/galette/templates/default/advanced_search.tpl
index b275e2e0a9ae19fd935f906ddd9760110e7ee819..776094ec68f2380126b6bcc057bf811798482555 100644 (file)
--- a/galette/templates/default/advanced_search.tpl
+++ b/galette/templates/default/advanced_search.tpl
@@ -246,6 +246,9 @@
                             <option value="dyn_{$field->getId()}"{if $fs.field eq $rid} selected="selected"{/if}>{$field->getName()}</option>
     {/foreach}
                         </select>
+    {* may not be defined *}
+    {if !isset($cur_field)}{assign var=cur_field value=null}{/if}
+    {if !isset($type)}{assign var=type value=null}{/if}
                         <span class="data">
                             <input type="hidden" name="free_type[]" value="{if isset($cur_field)}{$cur_field->getType()}{/if}"/>
     {if $cur_field|is_a:'Galette\DynamicFields\Choice' || $type eq constant('Galette\DynamicFields\DynamicField::CHOICE')}

diff --git a/galette/templates/default/gestion_mailings.tpl b/galette/templates/default/gestion_mailings.tpl
index bbb3decdff947a7586bab50c85970f8b999d032e..af2ac9379dfd52324b96d6bdcd21a12306389f21 100644 (file)
--- a/galette/templates/default/gestion_mailings.tpl
+++ b/galette/templates/default/gestion_mailings.tpl
@@ -122,7 +122,7 @@
                         {$smarty.foreach.eachlog.iteration}
     {/if}
                         <span class="row-title">
-                            {_T string="Mailing entry %id" pattern="/%id/" replace=$log.mailing.mailing_id}
+                            {_T string="Mailing entry %id" pattern="/%id/" replace=$log.mailing_id}
                         </span>
                     </td>
                     <td class="nowrap" data-title="{_T string="Date"}">{$log.mailing_date|date_format:"%a %d/%m/%Y - %R"}</td>

diff --git a/galette/templates/default/mailing_adherents.tpl b/galette/templates/default/mailing_adherents.tpl
index 9d3bbc2af516d900c0e887fec46ee9e65115e681..8aeffa31410eaf40e307a3550b09cdbd67a9146f 100644 (file)
--- a/galette/templates/default/mailing_adherents.tpl
+++ b/galette/templates/default/mailing_adherents.tpl
@@ -344,10 +344,13 @@
                     _sender_name.val('{$preferences->pref_email_nom|escape:"javascript"}');
                     _sender_address.val('{$preferences->pref_email|escape:"javascript"}');
                     break;
+
+        {if (!$login->isSuperAdmin())}
                 case '{Galette\Core\GaletteMail::SENDER_CURRENT}':
                     _sender_name.val('{$sender_current['name']|escape:"javascript"}');
                     _sender_address.val('{$sender_current['email']|escape:"javascript"}');
                     break;
+        {/if}
                 case '{Galette\Core\GaletteMail::SENDER_OTHER}':
                     _sender_name.val('');
                     _sender_address.val('');