Skip to content

Commit

Permalink
Fix times search fields in range display mode (Cocolabs-SAS#253)
Browse files Browse the repository at this point in the history
  • Loading branch information
afedak authored and cocolabssas committed Dec 12, 2018
1 parent aad013b commit d873418
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 22 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ and to the [CHANGELOG recommendations](http://keepachangelog.com/).
- Fix new booking form handler without BOOKING_NEW_FORM_PROCESS listeners
- Fix user label translation in payin refund in sonata admin
- Fix IBAN form field length
- Fix times search fields in range display mode

### Changed
- Upgrade Microsoft Translator API request method from Bing to Azur
Expand Down
46 changes: 24 additions & 22 deletions src/Cocorico/CoreBundle/Resources/views/Form/fields.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -725,30 +725,32 @@
{{ form_widget(form.end) }}
</div>
{% else %}
<strong class="title">
{{ form_label(form.end) }}
</strong>
<div class="col">
<strong class="title">
{{ form_label(form.end) }}
</strong>

{{ form_errors(form.end) }}
{% if timePicker %}
<div class='input-group date' id='datetimepicker3'>
{{ form_widget(form.end_picker,{
'attr': {
'class': 'form-control',
'placeholder': '--:--',
}
}) }}
<span class="input-group-addon">
<span class="glyphicon glyphicon-time"></span>
</span>
</div>
{#hide end time field#}
<div class="hidden">
{{ form_errors(form.end) }}
{% if timePicker %}
<div class='input-group date' id='datetimepicker3'>
{{ form_widget(form.end_picker,{
'attr': {
'class': 'form-control',
'placeholder': '--:--',
}
}) }}
<span class="input-group-addon">
<span class="glyphicon glyphicon-time"></span>
</span>
</div>
{#hide end time field#}
<div class="hidden">
{{ form_widget(form.end) }}
</div>
{% else %}
{{ form_widget(form.end) }}
</div>
{% else %}
{{ form_widget(form.end) }}
{% endif %}
{% endif %}
</div>
{% endif %}
</div>
{%- endblock -%}
Expand Down

0 comments on commit d873418

Please sign in to comment.