Merge pull request #4191 from Romashka/master

Fixed revisions compare view
sonata-project · Nov 22, 2016 · e6a4232 · e6a4232
2 parents d404b31 + 3962e3f
commit e6a4232
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/Resources/views/CRUD/base_show.html.twig b/Resources/views/CRUD/base_show.html.twig
@@ -11,8 +11,6 @@ file that was distributed with this source code.
 
 {% extends base_template %}
 
-{% import 'SonataAdminBundle:CRUD:base_show_macro.html.twig' as show_helper %}
-
 {%- block actions -%}
     {% include 'SonataAdminBundle:CRUD:action_buttons.html.twig' %}
 {%- endblock -%}
@@ -56,19 +54,58 @@ file that was distributed with this source code.
                                         <p>{{ show_tab.description|raw }}</p>
                                     {% endif %}
 
-                                    {{ show_helper.render_groups(admin, object, elements, show_tab.groups, has_tab) }}
+                                    {% set groups = show_tab.groups %}
+                                    {{ block('show_groups') }}
                                 </div>
                             </div>
                         </div>
                     {% endfor %}
                 </div>
             </div>
         {% elseif admin.showtabs is iterable %}
-            {{ show_helper.render_groups(admin, object, elements, admin.showtabs.default.groups, has_tab) }}
+            {% set groups = admin.showtabs.default.groups %}
+            {{ block('show_groups') }}
         {% endif %}
 
     </div>
 
     {{ sonata_block_render_event('sonata.admin.show.bottom', { 'admin': admin, 'object': object }) }}
 {% endblock %}
 
+{% block show_groups %}
+    <div class="row">
+        {% block field_row %}
+            {% for code in groups %}
+                {% set show_group = admin.showgroups[code] %}
+
+                <div class="{{ show_group.class|default('col-md-12') }} {{ no_padding|default(false) ? 'nopadding' }}">
+                    <div class="{{ show_group.box_class }}">
+                        <div class="box-header">
+                            <h4 class="box-title">
+                                {% block show_title %}
+                                    {{ admin.trans(show_group.name, {}, show_group.translation_domain) }}
+                                {% endblock %}
+                            </h4>
+                        </div>
+                        <div class="box-body table-responsive no-padding">
+                            <table class="table">
+                                <tbody>
+                                {% for field_name in show_group.fields %}
+                                    {% block show_field %}
+                                        <tr class="sonata-ba-view-container">
+                                            {% if elements[field_name] is defined %}
+                                                {{ elements[field_name]|render_view_element(object)}}
+                                            {% endif %}
+                                        </tr>
+                                    {% endblock %}
+                                {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+        {% endblock %}
+
+    </div>
+{% endblock %}
diff --git a/Resources/views/CRUD/base_show_compare.html.twig b/Resources/views/CRUD/base_show_compare.html.twig
@@ -11,10 +11,6 @@ file that was distributed with this source code.
 
 {% extends 'SonataAdminBundle:CRUD:base_show.html.twig' %}
 
-{% block show_title %}
-    {{ name|trans({}, admin.translationdomain) }}
-{% endblock %}
-
 {% block show_field %}
     <tr class="sonata-ba-view-container history-audit-compare">
         {% if elements[field_name] is defined %}

diff --git a/Resources/views/CRUD/base_show_macro.html.twig b/Resources/views/CRUD/base_show_macro.html.twig
@@ -1,3 +1,5 @@
+{# NEXT_MAJOR: remove this template #}
+
 {% macro render_groups(admin, object, elements, groups, has_tab, no_padding = false) %}
     <div class="row">
         {{ block('field_row') }}