Fix core date check; closes #1265

diff --git a/galette/templates/default/advanced_search.tpl b/galette/templates/default/advanced_search.tpl
index 84261925e6f903616df73603fc49e3db8d9f8822..c55719fab7c7ba62c3cb4878d6f606a8f6995a60 100644 (file)
--- a/galette/templates/default/advanced_search.tpl
+++ b/galette/templates/default/advanced_search.tpl
@@ -223,7 +223,7 @@
                         {html_options options=$fvalues selected=$fs.search}
         {/if}
                         </select>
-    {elseif $cur_field|is_a:'Galette\DynamicFields\Date'}
+    {elseif $cur_field|is_a:'Galette\DynamicFields\Date' || $type == constant('Galette\DynamicFields\DynamicField::DATE')}
                         <select name="free_query_operator[]" class="nochosen">
                             <option value="{Galette\Filters\AdvancedMembersList::OP_EQUALS}"{if $fs.qry_op eq constant('Galette\Filters\AdvancedMembersList::OP_EQUALS')} selected="selected"{/if}>{_T string="is"}</option>
                             <option value="{Galette\Filters\AdvancedMembersList::OP_BEFORE}"{if $fs.qry_op eq constant('Galette\Filters\AdvancedMembersList::OP_BEFORE')} selected="selected"{/if}>{_T string="before"}</option>
@@ -231,7 +231,7 @@
                         </select>
                         <input type="text" name="free_text[]" value="{$fs.search|date_format:{_T string="Y-m-d"}}" class="modif_date" maxlength="10" size="10"/>
                         <span class="exemple">{_T string="(yyyy-mm-dd format)"}</span>
-    {elseif $cur_field|is_a:'Galette\DynamicFields\Boolean'}
+    {elseif $cur_field|is_a:'Galette\DynamicFields\Boolean' || $type == constant('Galette\DynamicFields\DynamicField::BOOLEAN')}
                         <select name="free_query_operator[]" class="nochosen">
                             <option value="{Galette\Filters\AdvancedMembersList::OP_EQUALS}"{if $fs.qry_op eq constant('Galette\Filters\AdvancedMembersList::OP_EQUALS')} selected="selected"{/if}>{_T string="is"}</option>
                         </select>

diff --git a/galette/templates/default/edit_dynamic_fields.tpl b/galette/templates/default/edit_dynamic_fields.tpl
index 0e4c26c6d598b509d929217fbc5b9cdd0caf2adf..72d6cced62256e604862f7f0d729438204785d00 100644 (file)
--- a/galette/templates/default/edit_dynamic_fields.tpl
+++ b/galette/templates/default/edit_dynamic_fields.tpl
@@ -36,7 +36,7 @@
         </select>
     {elseif $field|is_a:'Galette\DynamicFields\Date'}
         <input type="text" name="info_field_{$field->getId()}_{$loop}" id="info_field_{$field->getId()}_{$loop}" maxlength="10"
-            value="{$valuedata}" class="dynamic_date"
+            value="{$valuedata}" class="dynamic_date modif_date"
             {if $field->isRepeatable()} data-maxrepeat="{$field->getRepeat()}"{/if}
             {if $field->isRequired()} required="required"{/if}
             {if $disabled} disabled="disabled"{/if}