Merge pull request #3813 from Soullivaneuh/date-time-single-text

Handle separated date and time single_text widget from datetime

CHANGELOG.md

@@ -17,6 +17,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Deprecated `AdminHelper::camelize()`
 - Deprecated `Admin` class
 
+### Fixed
+- Fixed bad rendering on datetime field with `single_text` widget for date and time
+
 ## [3.0.0](https://github.com/sonata-project/SonataAdminBundle/compare/2.3.10...3.0.0) - 2016-05-08
 ### Added
 - Add missing Route constructor parameters to `RouteCollection:add` method

Resources/views/Form/form_admin_fields.html.twig

@@ -289,8 +289,22 @@ file that was distributed with this source code.
         <div {{ block('widget_container_attributes') }}>
             {{ form_errors(form.date) }}
             {{ form_errors(form.time) }}
-            {{ form_widget(form.date, {'row': false, 'input_wrapper_class': 'col-sm-2'}) }}
-            {{ form_widget(form.time, {'row': false, 'input_wrapper_class': 'col-sm-2'}) }}
+
+            {% if form.date.vars.widget == 'single_text' %}
+                <div class="col-sm-2">
+                    {{ form_widget(form.date) }}
+                </div>
+            {% else %}
+                {{ form_widget(form.date, {'row': false, 'input_wrapper_class': 'col-sm-2'}) }}
+            {% endif %}
+
+            {% if form.time.vars.widget == 'single_text' %}
+                <div class="col-sm-2">
+                    {{ form_widget(form.time) }}
+                </div>
+            {% else %}
+                {{ form_widget(form.time, {'row': false, 'input_wrapper_class': 'col-sm-2'}) }}
+            {% endif %}
         </div>
     {% endif %}
 {% endspaceless %}