Pārlūkot izejas kodu

refactored IF statement in one-to-one templates so values are displayed even if an AssociatedAdmin is not defined

Matt Grosse 13 gadi atpakaļ
vecāks
revīzija
93fa143838

+ 4 - 6
Resources/views/CRUD/list_orm_one_to_one.html.twig

@@ -12,11 +12,9 @@ file that was distributed with this source code.
 {% extends 'SonataAdminBundle:CRUD:base_list_field.html.twig' %}
 
 {% block field %}
-    {% if field_description.hasAssociationAdmin and field_description.associationadmin.id(value) %}
-        {% if field_description.hasAssociationAdmin and field_description.associationadmin.isGranted('EDIT') and field_description.associationadmin.hasRoute('edit') %}
-            <a href="{{ field_description.associationadmin.generateObjectUrl('edit', value) }}">{{ value|render_relation_element(field_description) }}</a>
-        {% else %}
-            {{ value|render_relation_element(field_description) }}
-        {% endif %}
+    {% if field_description.hasAssociationAdmin and field_description.associationadmin.id(value) and field_description.associationadmin.isGranted('EDIT') and field_description.associationadmin.hasRoute('edit') %}
+        <a href="{{ field_description.associationadmin.generateObjectUrl('edit', value) }}">{{ value|render_relation_element(field_description) }}</a>
+    {% else %}
+        {{ value|render_relation_element(field_description) }}
     {% endif %}
 {% endblock %}

+ 4 - 6
Resources/views/CRUD/show_orm_one_to_one.html.twig

@@ -12,11 +12,9 @@ file that was distributed with this source code.
 {% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
 
 {% block field %}
-    {% if field_description.hasAssociationAdmin and field_description.associationadmin.id(value) %}
-        {% if field_description.hasAssociationAdmin and field_description.associationadmin.isGranted('EDIT') and field_description.associationadmin.hasRoute('edit') %}
-            <a href="{{ field_description.associationadmin.generateObjectUrl('edit', value) }}">{{ value|render_relation_element(field_description) }}</a>
-        {% else %}
-            {{ value|render_relation_element(field_description) }}
-        {% endif %}
+    {% if field_description.hasAssociationAdmin and field_description.associationadmin.id(value) and field_description.associationadmin.isGranted('EDIT') and field_description.associationadmin.hasRoute('edit') %}
+        <a href="{{ field_description.associationadmin.generateObjectUrl('edit', value) }}">{{ value|render_relation_element(field_description) }}</a>
+    {% else %}
+        {{ value|render_relation_element(field_description) }}
     {% endif %}
 {% endblock %}